]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2194619 15b9521)
Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:08:40 +0000 (05:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 28 Oct 2011 12:08:40 +0000 (05:08 -0700)
commite97e3aec87bfe28c76937bf21f962e5c9810befc
tree5d701b2c3ca84a7848c240a325621868d9592da7tree | snapshot
parent2194619f35cccbd1bd3f5dc1c2a5cdc2a5245ef1commit | diff
parent15b952145819a65f5ac2c647159fcda537212cdfcommit | diff
Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Hyper-V: Integrate the clocksource with Hyper-V detection code

Fix up conflicts in drivers/staging/hv/Makefile manually (some of the hv
code has moved out of staging to drivers/hv/)
drivers/staging/hv/Makefile diff1 | diff2 | blob | history
Linux Kernel Source Tree.