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 /arch/x86/pci/Makefile | |
| parent | Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86, hyperv: Move a variable to avoid an unused variable warning (diff) | |
| download | linux-dev-2dc1733fd4ebd4a67c9312d85f1dbc2ac2ffeb26.tar.xz linux-dev-2dc1733fd4ebd4a67c9312d85f1dbc2ac2ffeb26.zip | |
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 'arch/x86/pci/Makefile')
0 files changed, 0 insertions, 0 deletions