Merge branch 'topic/ppc-kvm' into next

Merge our ppc-kvm topic branch to bring in the Ultravisor support
patches.

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

diff --cc arch/powerpc/kernel/iommu.c
Simple merge

diff --cc arch/powerpc/mm/book3s64/hash_utils.c
Simple merge

diff --cc arch/powerpc/mm/book3s64/pgtable.c
Simple merge

diff --cc arch/powerpc/mm/book3s64/radix_pgtable.c
Simple merge

diff --cc arch/powerpc/platforms/powernv/Makefile
Simple merge

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

diff --cc arch/powerpc/platforms/pseries/iommu.c
Simple merge