tree 5443fedac650dfa11e15eee8e4295ad016e930e8
parent 69019d77c71472428a5d67ab8bb7cfa9145000d0
parent 4c08edd305019061bf1ac95ce089497bdbb8b8ac
author Linus Torvalds <torvalds@linux-foundation.org> 1384222069 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1384222069 +0900

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