tree d0508279d7a557f65a44f1f4fc29fcfd16518064
parent 7a66ecfd319af8fe4f4c3eadf019b998c93d6687
parent 23528bb21ee2c9b27f3feddd77a2a3351a8df148
author Paolo Bonzini <pbonzini@redhat.com> 1470074610 +0200
committer Paolo Bonzini <pbonzini@redhat.com> 1470074610 +0200

Merge commit '23528bb21ee2' into HEAD

Conflicts:
	arch/powerpc/include/asm/paca.h
	arch/powerpc/kernel/Makefile
	arch/powerpc/kernel/exceptions-64s.S
	arch/powerpc/kernel/idle_book3s.S
	arch/powerpc/kernel/traps.c
	arch/s390/hypfs/hypfs_diag.c
	arch/s390/mm/gmap.c
	arch/x86/kvm/vmx.c
	include/linux/irqchip/arm-gic-v3.h
	virt/kvm/arm/vgic.c
	virt/kvm/kvm_main.c