Merge branch 'kvmarm-master/master' into HEAD

diff --cc arch/arm/kvm/handle_exit.c
Simple merge

diff --cc arch/arm/kvm/hyp/switch.c
Simple merge

diff --cc include/kvm/arm_vgic.h
Simple merge

diff --cc virt/kvm/arm/vgic/vgic-mmio-v2.c
Simple merge

diff --cc virt/kvm/arm/vgic/vgic-mmio-v3.c
Simple merge