From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Jan 2015 21:54:30 +0000 (+1300)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Tag: Ubuntu-5.0.0-8.9~10130
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=48c53db22032841290113799d43b24a677a4b24a;p=mirror_ubuntu-disco-kernel.git

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

Pull kvm fixes from Paolo Bonzini:
 "Two bugfixes for arm64.  I will have another pull request next week,
  but otherwise things are calm"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  arm64: KVM: Fix HCR setting for 32bit guests
  arm64: KVM: Fix TLB invalidation by IPA/VMID
---

48c53db22032841290113799d43b24a677a4b24a