tree 28aa81a0f7425be438eb1a31e33a1d8ae90c0292
parent cca8209ed962f87990345ba073979d2b55dd1187
parent b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d
author Linus Torvalds <torvalds@linux-foundation.org> 1287694404 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1287694404 -0700

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