]> git.kernelconcepts.de Git - mv-sheeva.git/commitdiff
Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jan 2011 18:44:21 +0000 (10:44 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 2 Jan 2011 18:44:21 +0000 (10:44 -0800)
* 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: i8259: initialize isr_ack
  KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow


Trivial merge