Merge branches 'amd/transparent-bridge' and 'core'
Joerg Roedel [Tue, 21 Jun 2011 09:14:10 +0000 (11:14 +0200)]
Conflicts:
arch/x86/include/asm/amd_iommu_types.h
arch/x86/kernel/amd_iommu.c

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

1  2  3 
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_types.h

Simple merge
Simple merge