diff options
| author | Joerg Roedel <jroedel@suse.de> | 2017-06-28 14:45:02 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2017-06-28 14:45:02 +0200 |
| commit | 6a7086431fa18df7d03b1ed0126426c79b38dc8c (patch) | |
| tree | 800acfd39ec85ebea036e6ef6cff72f2b6807830 /drivers/iommu/dma-iommu.c | |
| parent | 84a21dbdef0b96d773599c33c2afbb002198d303 (diff) | |
| parent | 4f1fcfe94c1700f9e891adc1ca364a5cef00bbfd (diff) | |
| parent | 26b6aec6e726597149b4bcd4cc8583f402f3da14 (diff) | |
| parent | 0b25635bd4da0a4b3d294f7b27aea0dc0cdfccff (diff) | |
| parent | 757c370f036e1f9f9a816cd481a13cdbcb346eb9 (diff) | |
| parent | 01e1932a1748e20b69ba23d0a01db5eb3a525782 (diff) | |
| parent | 9ce3a72cd7f7e0b9ba1c5952e4461b363824bca9 (diff) | |
| parent | 0929deca40bbdd7e821aada2906ac67882cfbf28 (diff) | |
| parent | 72dcac633475a5b331cf21f3525467d0e123395a (diff) | |
Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next