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

diff --cc arch/hexagon/kernel/dma.c
Simple merge

diff --cc arch/ia64/hp/common/sba_iommu.c
Simple merge

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

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

diff --cc arch/x86/kernel/pci-calgary_64.c
Simple merge

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

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

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

diff --cc include/linux/dma-mapping.h
Simple merge