pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit - arch/arm/mach-omap2/Kconfig

Merge branch 'linus' into cpumask-for-linus

Conflicts:
arch/x86/kernel/cpu/common.c

12 files changed:

Unnamed repository; edit this file 'description' to name the repository.

arch/x86/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/p4-clockmod.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/powernow-k8.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/cpufreq/speedstep-ich.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel_cacheinfo.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_amd_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/mce_intel_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/tlb_uv.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
mm/vmscan.c	diff1 \|	diff2 \|	blob \| history