From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Apr 2012 17:28:59 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: android-x86-4.4-r1~3331
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9e01297ee1ada71e621c8b58a80a28a421a00471;p=android-x86%2Fkernel.git

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull KVM updates from Marcelo Tosatti.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: lock slots_lock around device assignment
  KVM: VMX: Fix kvm_set_shared_msr() called in preemptible context
  KVM: unmap pages from the iommu when slots are removed
  KVM: PMU emulation: GLOBAL_CTRL MSR should be enabled on reset
---

9e01297ee1ada71e621c8b58a80a28a421a00471