Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core...
authorJoerg Roedel <jroedel@suse.de>
Wed, 28 Jun 2017 12:45:02 +0000 (14:45 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 28 Jun 2017 12:45:02 +0000 (14:45 +0200)
commit6a7086431fa18df7d03b1ed0126426c79b38dc8c
tree800acfd39ec85ebea036e6ef6cff72f2b6807830
parent84a21dbdef0b96d773599c33c2afbb002198d303
parent4f1fcfe94c1700f9e891adc1ca364a5cef00bbfd
parent26b6aec6e726597149b4bcd4cc8583f402f3da14
parent0b25635bd4da0a4b3d294f7b27aea0dc0cdfccff
parent757c370f036e1f9f9a816cd481a13cdbcb346eb9
parent01e1932a1748e20b69ba23d0a01db5eb3a525782
parent9ce3a72cd7f7e0b9ba1c5952e4461b363824bca9
parent0929deca40bbdd7e821aada2906ac67882cfbf28
parent72dcac633475a5b331cf21f3525467d0e123395a
Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next
drivers/iommu/Kconfig
drivers/iommu/amd_iommu.c
drivers/iommu/dma-iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/iova.c