Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and...
authorJoerg Roedel <joerg.roedel@amd.com>
Thu, 28 May 2009 16:23:56 +0000 (18:23 +0200)
committerJoerg Roedel <joerg.roedel@amd.com>
Thu, 28 May 2009 16:23:56 +0000 (18:23 +0200)
commit83cce2b69eaa4bc7535f98f75b79397baf277470
tree538c3e7c6d587ce6f57ca65bb2cd4e805fbfc312
parentc1eee67b2d8464781f5868a34168df61e40e85a6
parent2e8b569614b89c9b1b85cba37db36daeeeff744e
parent736501ee000757082a4f0832826ae1eda7ea106e
parent47bccd6bb2b866449d3ecf2ba350ac1c7473b2b8
Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31

Conflicts:
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c
arch/x86/kernel/amd_iommu_init.c