Merge git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jan 2013 18:17:09 +0000 (10:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 16 Jan 2013 18:17:09 +0000 (10:17 -0800)
commit56400b55c0ba02a8abecbc541193ea6a309635ce
tree71381a8fe979b7d4a76a857c03f9da518e593e7f
parentaa8b550c892aa70837e36f4681cc5a20b1fea47d
parent83987ace22f541964bd0dbf83a3f6b0014ba3e1e
Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull s390 KVM fix from Gleb Natapov.

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  s390/kvm: Fix BUG in include/linux/kvm_host.h:745