Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:26:15 +0000 (08:26 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Oct 2009 23:26:15 +0000 (08:26 +0900)
commit422b42fa79fa2825dc7b272ee8d52aa4bac37113
tree4e5b77896547dee638aed11991287a5595b5bbe2
parent1b7607030df6908901250b5d7de03ba74cca7d67
parent0ea4ed8e948c30f88c824c973ee4b9529015fe65
Merge branch 'kvm-updates/2.6.32' of git://git./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