Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and...
authorJoerg Roedel <jroedel@suse.de>
Thu, 4 Jul 2019 15:26:48 +0000 (17:26 +0200)
committerJoerg Roedel <jroedel@suse.de>
Thu, 4 Jul 2019 15:26:48 +0000 (17:26 +0200)
commitd95c3885865b71e56d8d60c8617f2ce1f0fa079d
treed8786645fbbfd109ba28e701ab326b02f49e701e
parent0bcfa628f8a303f86876424475ba5390d229e736
parent5cd3f2e98ccaa668210ed2e3a1d6bde3189fe366
parent8dd8f005bdd45823fc153ef490239558caf6ff20
parent9378bfeaafcbbdf234daeee93db31a3f2c815513
parentceedd5f74d8cfe34db4e654a7808e3c5de40d6f5
parent29fcea8ce7f3c16ebd267f8cb2f4a07887530aa9
Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and 'core' into next
13 files changed:
drivers/iommu/amd_iommu.c
drivers/iommu/amd_iommu_init.c
drivers/iommu/dma-iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/intel-pasid.c
drivers/iommu/intel-svm.c
drivers/iommu/iommu.c
drivers/iommu/omap-iommu-debug.c
drivers/iommu/omap-iommu.c
include/linux/device.h
include/linux/intel-iommu.h
include/linux/intel-svm.h
include/linux/iommu.h