Merge branch 'topic/ppc-kvm' into next
authorMichael Ellerman <mpe@ellerman.id.au>
Fri, 28 Apr 2017 10:19:37 +0000 (20:19 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 28 Apr 2017 10:19:37 +0000 (20:19 +1000)
commitb13f6683ed4f42b2b4bed86ca2dec4ba478af47c
tree1cd23bb222a80f4b7e495062f5100367c9317072
parent096ff2ddba83bf022d593a3096d683e57c4befb0
parente5afdf9dd515a9446c009f44f99f9bc2f91b89a7
Merge branch 'topic/ppc-kvm' into next

Merge the topic branch we were sharing with kvm-ppc, Paul has also
merged it.
arch/powerpc/include/asm/mmu_context.h
arch/powerpc/mm/mmu_context_iommu.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.c