Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 3 Nov 2009 11:05:40 +0000 (12:05 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 3 Nov 2009 11:05:40 +0000 (12:05 +0100)
commit342688f9db392ec82ab9e6b25a6137f9ee1647d7
treee55eca548851778a559674e467e34574ae2c633a
parent012abeea669ea49636cf952d13298bb68654146a
parentca0207114f1708b563f510b7781a360ec5b98359
parent59a40e70458341b35d123b60aca416a1d97ebbe3
Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes
arch/x86/include/asm/amd_iommu.h
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c