Merge remote-tracking branch 'iommu/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)
diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/iommu/Kconfig
Simple merge
diff --cc drivers/iommu/dma-iommu.c
Simple merge
diff --cc drivers/iommu/iommu.c
Simple merge
diff --cc include/linux/iommu.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)
		1	2
Documentation/admin-guide/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/dma-iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/iommu/iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/iommu.h	patch \|	diff1 \|	diff2 \|	blob \| history