projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b76070 0ea4ed8)
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)
* '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


Trivial merge
John Crispins staging tree