Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
Jesse Barnes [Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)]
1  2 
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/pci-gart_64.c

Simple merge
Simple merge