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>
Showing
drivers/iommu/Kconfig
0 → 100644
drivers/iommu/Makefile
0 → 100644
This diff is collapsed.
Please register or sign in to comment