From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 2 Jan 2009 21:41:36 +0000 (+0100)
Subject: Merge branch 'linus' into x86/cleanups
X-Git-Tag: v2.6.29-rc1~4^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=923a789b49c7269a0245d5af6afe486188d940df;p=linux-2.6-block.git

Merge branch 'linus' into x86/cleanups

Conflicts:
	arch/x86/kernel/reboot.c
---

923a789b49c7269a0245d5af6afe486188d940df
diff --cc arch/x86/kernel/reboot.c
index a90913cccfb7,39643b1df061..bf088c61fa40
--- a/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>