Merge branches 'iommu/fixes', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and...

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

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

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

diff --cc drivers/iommu/io-pgtable-arm-v7s.c
Simple merge

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