From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Jul 2010 15:18:18 +0000 (-0700)
Subject: Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=20ba5efb9c788cb3308c8711757848cf0e596529;p=deliverable%2Flinux.git

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

20ba5efb9c788cb3308c8711757848cf0e596529