Merge remote-tracking branch 'kvm-ppc-paulus/kvm-ppc-next'

diff --cc arch/mips/include/asm/kvm_host.h
Simple merge

diff --cc arch/powerpc/platforms/powernv/pci-ioda.c
Simple merge

diff --cc arch/s390/include/asm/kvm_host.h
Simple merge

diff --cc arch/x86/include/asm/kvm_host.h
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge