Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
authorJesse Barnes <jbarnes@hobbes.lan>
Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 28 Jul 2008 21:31:10 +0000 (14:31 -0700)
commit29111f579f4f3f2a07385f931854ab0527ae7ea5
tree0271f20b0c954fa364be8627e0d6065544de0534
parentcc5499c3a607a392e8a7adb934aaf14b2c6a3519
parent87e39ea5714dd59ba31e36c25833d2b20255a29d
Merge branch 'x86/iommu' of git://git./linux/kernel/git/tip/linux-2.6-tip into for-linus
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/pci-gart_64.c