Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/amd/amd_iommu.h
Simple merge

diff --cc drivers/iommu/amd/amd_iommu_types.h
Simple merge

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

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

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

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

diff --cc include/linux/io-pgtable.h
Simple merge

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