projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cca8209 b0f4c06)
Merge branch 'x86-vmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:53:24 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Oct 2010 20:53:24 +0000 (13:53 -0700)
commit709d9f54cc1847a2d24224ffedec7fd4d0f3c714
tree28aa81a0f7425be438eb1a31e33a1d8ae90c0292tree | snapshot
parentcca8209ed962f87990345ba073979d2b55dd1187commit | diff
parentb0f4c062fb6dd4c02b1fe6de73319ed50a09b27dcommit | diff
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
Documentation/kernel-parameters.txt diff1 | diff2 | blob | history
arch/x86/Kconfig diff1 | diff2 | blob | history
arch/x86/kernel/Makefile diff1 | diff2 | blob | history
arch/x86/kernel/setup.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
arch/x86/mm/pgtable.c diff1 | diff2 | blob | history
ep93xx device tree rework repo: git://git.maquefel.me/linux.git