| commit | 709d9f54cc1847a2d24224ffedec7fd4d0f3c714 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 20:53:24 +0000 (21 13:53 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 21 Oct 2010 20:53:24 +0000 (21 13:53 -0700) | ||
| tree | 28aa81a0f7425be438eb1a31e33a1d8ae90c0292 | treesnapshot (tar.gz zip) |
| parent | cca8209ed962f87990345ba073979d2b55dd1187 | commitdiff |
| parent | b0f4c062fb6dd4c02b1fe6de73319ed50a09b27d | commitdiff |
Merge branch 'x86-vmware-for-linus' of git://git./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
* '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