Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

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

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