Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 15:50:38 +0000 (18:50 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 5 Aug 2015 15:50:38 +0000 (18:50 +0300)
Pull KVM fixes from Paolo Bonzini:
 "Just two very small & simple patches"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: MTRR: Use default type for non-MTRR-covered gfn before WARN_ON
  KVM: s390: Fix hang VCPU hang/loop regression


Trivial merge