Merge branch 'linus' into x86/urgent
Ingo Molnar [Mon, 7 Dec 2009 12:14:12 +0000 (13:14 +0100)]
Merge reason: we want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
arch/x86/Kconfig
arch/x86/Makefile_32.cpu
arch/x86/kernel/cpu/intel_cacheinfo.c
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/reboot.c
arch/x86/mm/kmmio.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge