Merge branches 'arm/allwinner', 'arm/mediatek', 'arm/renesas', 'arm/tegra', 'arm...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Kconfig
Simple merge

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

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

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

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