Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next
Conflicts: drivers/iommu/amd_iommu_types.h
Showing
This diff is collapsed.
drivers/iommu/dma-iommu.c
0 → 100644
This diff is collapsed.
drivers/iommu/s390-iommu.c
0 → 100644
include/linux/dma-iommu.h
0 → 100644
Please register or sign in to comment