Merge branch 'linus' into x86/cleanups
Ingo Molnar [Fri, 2 Jan 2009 21:41:36 +0000 (22:41 +0100)]
Conflicts:
arch/x86/kernel/reboot.c

1  2 
arch/x86/kernel/apic.c
arch/x86/kernel/cpu/mtrr/main.c
arch/x86/kernel/genx2apic_phys.c
arch/x86/kernel/io_apic.c
arch/x86/kernel/reboot.c
arch/x86/kernel/traps.c

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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>
Simple merge