Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jan 2014 22:50:18 +0000 (14:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Jan 2014 22:50:18 +0000 (14:50 -0800)
commit7a262d2ed9fa42fad8c4f243f8025580b58cf2f6
tree82f11a11fc0bf0a9f64cad2dddbca32b78337916
parent06f055f394da2364b944d41b9609589763ae762a
parent29bf08f12b2fd72b882da0d85b7385e4a438a297
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