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

author Jesse Barnes <jbarnes@hobbes.lan>

Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)

committer Jesse Barnes <jbarnes@virtuousgeek.org>

Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
author Jesse Barnes <jbarnes@hobbes.lan>
Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
committer Jesse Barnes <jbarnes@virtuousgeek.org>
Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
diff --cc arch/x86/kernel/amd_iommu.c
Simple merge
diff --cc arch/x86/kernel/pci-gart_64.c
Simple merge
author	Jesse Barnes <jbarnes@hobbes.lan>
	Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
committer	Jesse Barnes <jbarnes@virtuousgeek.org>
	Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
		1	2
arch/x86/kernel/amd_iommu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-gart_64.c	patch \|	diff1 \|	diff2 \|	blob \| history