diff options
author | 2011-10-28 05:08:40 -0700 | |
---|---|---|
committer | 2011-10-28 05:08:40 -0700 | |
commit | cc21fe518a971bb2b0ab8370ec46ea21e84c57ab (patch) | |
tree | 5d701b2c3ca84a7848c240a325621868d9592da7 /lib/mpi/mpi-bit.c | |
parent | Merge branch 'x86-geode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | x86: Hyper-V: Integrate the clocksource with Hyper-V detection code (diff) | |
download | linux-dev-cc21fe518a971bb2b0ab8370ec46ea21e84c57ab.tar.xz linux-dev-cc21fe518a971bb2b0ab8370ec46ea21e84c57ab.zip |
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/)
Diffstat (limited to 'lib/mpi/mpi-bit.c')
0 files changed, 0 insertions, 0 deletions