| commit | 20ba5efb9c788cb3308c8711757848cf0e596529 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 26 08:18:18 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jul 26 08:18:18 2010 -0700 |
| tree | 490a570bc2538c6a93588eafc7a72411ac10535e | |
| parent | ab08937400eabe862f58974ad031a86c4ea2903a [diff] | |
| parent | 7a73c0283dadf1cf360a79de396ff0962e781b60 [diff] |
Merge branch 'kvm-updates/2.6.35' of git://git.kernel.org/pub/scm/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