Merge branch 'for-joerg/batched-unmap' of git://git.kernel.org/pub/scm/linux/kernel...

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

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

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

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

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