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)
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


Trivial merge