diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-02 14:50:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-02 14:50:18 -0800 |
| commit | 7a262d2ed9fa42fad8c4f243f8025580b58cf2f6 (patch) | |
| tree | 82f11a11fc0bf0a9f64cad2dddbca32b78337916 /include/linux/timerqueue.h | |
| parent | Merge branch 'akpm' (incoming from Andrew) (diff) | |
| parent | KVM: nVMX: Unconditionally uninit the MMU on nested vmexit (diff) | |
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull kvm bugfixes from Marcelo Tosatti.
* git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: nVMX: Unconditionally uninit the MMU on nested vmexit
KVM: x86: Fix APIC map calculation after re-enabling
Diffstat (limited to 'include/linux/timerqueue.h')
0 files changed, 0 insertions, 0 deletions