Merge remote-tracking branch 'dma-mapping/for-next'

diff --cc arch/powerpc/platforms/ps3/system-bus.c
Simple merge

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

diff --cc arch/s390/pci/pci_dma.c
Simple merge

diff --cc drivers/iommu/dma-iommu.c
Simple merge

diff --cc drivers/iommu/iommu.c
Simple merge