Joerg Roedel 801019d59d Merge branches 'amd/transparent-bridge' and 'core' ...

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

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

2011-06-21 11:14:10 +02:00

..

amd_iommu_init.c

…

amd_iommu_proto.h

…

amd_iommu_types.h

Merge branches 'amd/transparent-bridge' and 'core'

2011-06-21 11:14:10 +02:00

amd_iommu.c

Merge branches 'amd/transparent-bridge' and 'core'

2011-06-21 11:14:10 +02:00

dmar.c

…

intel-iommu.c

…

intr_remapping.c

…

intr_remapping.h

…

iommu.c

…

iova.c

…

Kconfig

…

Makefile

…

msm_iommu_dev.c

…

msm_iommu.c

…