]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a93f3e9 6f4151c)
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)
commitcc21fe518a971bb2b0ab8370ec46ea21e84c57ab
tree5d701b2c3ca84a7848c240a325621868d9592da7tree | snapshot
parenta93f3e9f424ffb82b4983d2ebf8667ef20255015commit | diff
parent6f4151c89b7d036c755d8cf74729e09b76fa6676commit | 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 for KaRo TX COM modules