Merge branch 'iommu/iommu-priv' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --cc drivers/iommu/arm-smmu-v3.c
Simple merge

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

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

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

diff --cc include/linux/iommu.h
Simple merge