From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Oct 2010 20:53:24 +0000 (-0700)
Subject: Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v2.6.37-rc1~199
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=709d9f54cc1847a2d24224ffedec7fd4d0f3c714

Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, paravirt: Remove alloc_pmd_clone hook, only used by VMI
  x86, vmware: Remove deprecated VMI kernel support

Fix up trivial #include conflict in arch/x86/kernel/smpboot.c
---

709d9f54cc1847a2d24224ffedec7fd4d0f3c714
diff --cc arch/x86/kernel/smpboot.c
index 0116552c950,63a1a5596ac..a3df9f83003
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@@ -62,8 -62,6 +62,7 @@@
  #include <asm/pgtable.h>
  #include <asm/tlbflush.h>
  #include <asm/mtrr.h>
 +#include <asm/mwait.h>
- #include <asm/vmi.h>
  #include <asm/apic.h>
  #include <asm/setup.h>
  #include <asm/uv/uv.h>