diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 20:10:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-19 20:10:21 -0800 |
| commit | 29d50523298eb80742cedd9ec4d42d6d6dbfb5ee (patch) | |
| tree | 344d6583f403e5957def18ea8b6ed35cd9fe9db0 /drivers/spi/spi-tegra20-slink.c | |
| parent | 026f149ca38adf96118d3b5fdba6977797861ce6 (diff) | |
| parent | cb20e5f2c8d6ba7440a32f4d70c0755bceb36e78 (diff) | |
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:
"The biggest change is support for Windows 8's improved hypervisor
interrupt model on the Linux Hyper-V guest subsystem code side.
Smallish fixes otherwise."
* 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86, hyperv: HYPERV depends on X86_LOCAL_APIC
X86: Handle Hyper-V vmbus interrupts as special hypervisor interrupts
X86: Add a check to catch Xen emulation of Hyper-V
x86: Hyper-V: register clocksource only if its advertised
Diffstat (limited to 'drivers/spi/spi-tegra20-slink.c')
0 files changed, 0 insertions, 0 deletions