Merge remote-tracking branch 'iommu/next'

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

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

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

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