| commit | cc21fe518a971bb2b0ab8370ec46ea21e84c57ab | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 28 05:08:40 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Oct 28 05:08:40 2011 -0700 |
| tree | 5d701b2c3ca84a7848c240a325621868d9592da7 | |
| parent | a93f3e9f424ffb82b4983d2ebf8667ef20255015 [diff] | |
| parent | 6f4151c89b7d036c755d8cf74729e09b76fa6676 [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/)