Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jul 2014 15:59:15 +0000 (08:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 30 Jul 2014 15:59:15 +0000 (08:59 -0700)
Pull KVM fix from Paolo Bonzini:
 "Fix a bug which allows KVM guests to bring down the entire system on
  some 64K enabled ARM64 hosts"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform


Trivial merge