Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 15:18:18 +0000 (08:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Jul 2010 15:18:18 +0000 (08:18 -0700)
commit20ba5efb9c788cb3308c8711757848cf0e596529
tree490a570bc2538c6a93588eafc7a72411ac10535e
parentab08937400eabe862f58974ad031a86c4ea2903a
parent7a73c0283dadf1cf360a79de396ff0962e781b60
Merge branch 'kvm-updates/2.6.35' of git://git./virt/kvm/kvm

* 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: Use kmalloc() instead of vmalloc() for KVM_[GS]ET_MSR
  KVM: MMU: fix conflict access permissions in direct sp