Merge branch 'x86/iommu' into x86/core

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/amd_iommu.c
Simple merge

diff --cc arch/x86/kernel/amd_iommu_init.c
Simple merge

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge