From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Jan 2014 22:50:18 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: firefly_0821_release~176^2~4703
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a262d2ed9fa42fad8c4f243f8025580b58cf2f6;p=firefly-linux-kernel-4.4.55.git

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
---

7a262d2ed9fa42fad8c4f243f8025580b58cf2f6