Merge tag 'kvm-arm-for-v3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 29 Aug 2014 10:26:54 +0000 (12:26 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 29 Aug 2014 10:26:54 +0000 (12:26 +0200)
commit8d68f67b57825b4287b599df1544a4df5bbdcccb
tree88029cd6d94b5b2cdeb9a3ab2f8e4ec13fc20de9
parent0ac625df43ce9d085d4ff54c1f739611f4308b13
parent05e0127f9e362b36aa35f17b1a3d52bca9322a3a
Merge tag 'kvm-arm-for-v3.17-rc3' of git://git./linux/kernel/git/kvmarm/kvmarm into HEAD

These fixes fix two issues in KVM for arm/arm64:
 - hyp mode initialization issues on certian boards/bootloader combos.
 - incorrect return address from trapped WFI/WFE instrucitons, which
   breaks non-linux guests.