Merge branch 'linus' into x86/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:12 +0000 (13:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Dec 2009 12:14:18 +0000 (13:14 +0100)
commitf3d607c6b39bd9cb5000e03e2c0dc2afe1241374
tree885b5e0b5bb3d87efc4bfbde69feff2ece32ecac
parent8055039c2a2454c7159dcbde3161943b757a6e0e
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d
Merge branch 'linus' into x86/urgent

Merge reason: we want to queue up a dependent fix.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
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