Merge branch 'x86/gart' into x86/iommu
authorIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 07:03:43 +0000 (09:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 22 Aug 2008 07:03:43 +0000 (09:03 +0200)
commit0d8136ea509132c66155ca8a1e7cf60699f95c37
tree560d720bacaad4e052a4dd6770c3b19329424b8a
parent766af9fa812f49feb4a3e62cf92f3d37f33c7fb6
parent7b22ff5344fda666e0938e5261ea7b9a3dfce497
Merge branch 'x86/gart' into x86/iommu
arch/x86/kernel/pci-gart_64.c