| commit | 422b42fa79fa2825dc7b272ee8d52aa4bac37113 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 22 08:26:15 2009 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 22 08:26:15 2009 +0900 |
| tree | 4e5b77896547dee638aed11991287a5595b5bbe2 | |
| parent | 1b7607030df6908901250b5d7de03ba74cca7d67 [diff] | |
| parent | 0ea4ed8e948c30f88c824c973ee4b9529015fe65 [diff] |
Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Prevent kvm_init from corrupting debugfs structures KVM: MMU: fix pointer cast KVM: use proper hrtimer function to retrieve expiration time