The following commit has been merged in the linux branch: commit 422b42fa79fa2825dc7b272ee8d52aa4bac37113 Merge: 1b7607030df6908901250b5d7de03ba74cca7d67 0ea4ed8e948c30f88c824c973ee4b9529015fe65 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 22 08:26:15 2009 +0900

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