Merge branch 'topic/ppc-kvm' into next

Merge the topic branch we were sharing with kvm-ppc, Paul has also
merged it.

diff --cc arch/powerpc/include/asm/mmu_context.h
Simple merge

diff --cc arch/powerpc/mm/mmu_context_iommu.c
Simple merge

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

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