Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c

diff --cc arch/x86/kernel/apic.c
Simple merge

diff --cc arch/x86/kernel/cpu/mtrr/main.c
Simple merge

diff --cc arch/x86/kernel/genx2apic_phys.c
Simple merge

diff --cc arch/x86/kernel/io_apic.c
Simple merge

diff --cc arch/x86/kernel/reboot.c
index a90913cccfb7a1f577b78e30e0ade0ec9557c159,39643b1df061d5ae049e8814a0abf126a430f362..bf088c61fa40c07fc8616505a8cee640b8f35e1d
--- 1/arch/x86/kernel/reboot.c
--- 2/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@@ -12,7 -12,7 +12,8 @@@
  #include <asm/proto.h>
  #include <asm/reboot_fixups.h>
  #include <asm/reboot.h>
 +#include <asm/pci_x86.h>
+ #include <asm/virtext.h>
  
  #ifdef CONFIG_X86_32
  # include <linux/dmi.h>

diff --cc arch/x86/kernel/traps.c
Simple merge