Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
authorMarc Zyngier <maz@kernel.org>
Fri, 8 Nov 2019 11:27:29 +0000 (11:27 +0000)
committerMarc Zyngier <maz@kernel.org>
Fri, 8 Nov 2019 11:27:29 +0000 (11:27 +0000)
commitcd7056ae34af0e9424da97bbc7d2b38246ba8a2c
treeeefb53f37554ebacf3a91a512839b6b6afbe75f4
parenta4b28f5c67983d92c911ca1404728bc4ea958c0e
parentef2e78ddadbb939ce79553b10dee0131d65d8f3e
Merge remote-tracking branch 'kvmarm/misc-5.5' into kvmarm/next
arch/arm/include/asm/kvm_emulate.h
arch/arm/kvm/guest.c
arch/arm64/include/asm/kvm_emulate.h
arch/arm64/kvm/guest.c
virt/kvm/arm/arm.c