Merge branches 'arm/omap', 'arm/exynos', 'arm/smmu', 'arm/mediatek', 'arm/qcom',...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iommu/Makefile
index f13f36ae1af652836254ba07315f99303fba6f88,f13f36ae1af652836254ba07315f99303fba6f88,f13f36ae1af652836254ba07315f99303fba6f88,a2729aadd300fa7b9f20d40edaa46d61f1a3b0c7,a2729aadd300fa7b9f20d40edaa46d61f1a3b0c7,f13f36ae1af652836254ba07315f99303fba6f88,f13f36ae1af652836254ba07315f99303fba6f88,c6a277e69848433abf2068ae036d29b84b95371f,bfe27b2755bda6beea642be89eb99b6d301c49b5,f13f36ae1af652836254ba07315f99303fba6f88..4f405f926e739cdd4d00937f9b57b4d42ee06b30
--- 1/drivers/iommu/Makefile
--- 2/drivers/iommu/Makefile
--- 3/drivers/iommu/Makefile
--- 4/drivers/iommu/Makefile
--- 5/drivers/iommu/Makefile
--- 6/drivers/iommu/Makefile
--- 7/drivers/iommu/Makefile
--- 8/drivers/iommu/Makefile
--- 9/drivers/iommu/Makefile
--- 10/drivers/iommu/Makefile
+++ b/drivers/iommu/Makefile
@@@@@@@@@@@ -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 -10,10 +10,10 @@@@@@@@@@@ obj-$(CONFIG_IOMMU_IO_PGTABLE_LPAE) += 
          obj-$(CONFIG_IOMMU_IOVA) += iova.o
          obj-$(CONFIG_OF_IOMMU)        += of_iommu.o
          obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o
------- --obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o
+++++++ ++obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o amd_iommu_init.o amd_iommu_quirks.o
          obj-$(CONFIG_AMD_IOMMU_DEBUGFS) += amd_iommu_debugfs.o
          obj-$(CONFIG_AMD_IOMMU_V2) += amd_iommu_v2.o
---  -----obj-$(CONFIG_ARM_SMMU) += arm-smmu.o
+++  +++++obj-$(CONFIG_ARM_SMMU) += arm-smmu.o arm-smmu-impl.o
          obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o
          obj-$(CONFIG_DMAR_TABLE) += dmar.o
          obj-$(CONFIG_INTEL_IOMMU) += intel-iommu.o intel-pasid.o

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

diff --cc drivers/iommu/dma-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/ipmmu-vmsa.c
Simple merge

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

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

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

diff --cc kernel/dma/direct.c
Simple merge