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>

diff --cc drivers/iommu/amd_iommu.c
Simple merge

diff --cc drivers/iommu/amd_iommu_types.h
Simple merge