diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 11:07:49 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 11:07:49 +0900 |
commit | 2dc1733fd4ebd4a67c9312d85f1dbc2ac2ffeb26 (patch) | |
tree | 5443fedac650dfa11e15eee8e4295ad016e930e8 /include | |
parent | 69019d77c71472428a5d67ab8bb7cfa9145000d0 (diff) | |
parent | 4c08edd305019061bf1ac95ce089497bdbb8b8ac (diff) | |
download | linux-2dc1733fd4ebd4a67c9312d85f1dbc2ac2ffeb26.tar.bz2 |
Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/hyperv changes from Ingo Molnar:
"These changes enable Linux guests to boot as 'Modern VM' guest kernels
on MS-Hyperv hosts"
* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, hyperv: Move a variable to avoid an unused variable warning
x86, hyperv: Fix build error due to missing <asm/apic.h> include
x86, hyperv: Correctly guard the local APIC calibration code
x86, hyperv: Get the local APIC timer frequency from the hypervisor
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions