tree 4e5b77896547dee638aed11991287a5595b5bbe2
parent 1b7607030df6908901250b5d7de03ba74cca7d67
parent 0ea4ed8e948c30f88c824c973ee4b9529015fe65
author Linus Torvalds <torvalds@linux-foundation.org> 1256167575 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1256167575 +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