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)
commit9109f4eb847b7c0be61ae25fb21b1ce2acc9c2d6
tree386be3479f32302b13924c5893c28ae2cbfad6f3
parenta1a54303d1c58709a0c16402942d6dede2f69f43
parentd0dfc6b74a0c6e9ee46b62713256e2b025244d3c
Merge branch 'kvm-updates/2.6.37' of git://git./virt/kvm/kvm

* '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