From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 13 May 2010 21:36:19 +0000 (-0700)
Subject: Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: v2.6.34~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9e766d81b1f432826fd773fc5d679b8a8095e941;p=linux-2.6-block.git

Merge branch 'kvm-updates/2.6.34' of git://git./virt/kvm/kvm

* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: PPC: Keep index within boundaries in kvmppc_44x_emul_tlbwe()
  KVM: VMX: blocked-by-sti must not defer NMI injections
  KVM: x86: Call vcpu_load and vcpu_put in cpuid_update
  KVM: SVM: Fix wrong intercept masks on 32 bit
  KVM: convert ioapic lock to spinlock
---

9e766d81b1f432826fd773fc5d679b8a8095e941