]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3276a31 85dca60)
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)
commit2aefb0f8a2ab7626ab5386ae6f86540da4a62b6b
tree28aa81a0f7425be438eb1a31e33a1d8ae90c0292tree | snapshot
parent3276a313cfd96963b02729d18338fe43ae7eca30commit | diff
parent85dca60f81649a825bcaf600eda3e24e2ad70951commit | diff
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
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
Linux Kernel Source Tree.