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

diff --cc arch/powerpc/kvm/book3s_64_mmu_hv.c
Simple merge

diff --cc arch/powerpc/kvm/book3s_hv_rm_mmu.c
Simple merge

diff --cc arch/powerpc/kvm/e500_mmu_host.c
Simple merge