diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-07-04 18:26:48 +0300 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2019-07-04 18:26:48 +0300 |
commit | d95c3885865b71e56d8d60c8617f2ce1f0fa079d (patch) | |
tree | d8786645fbbfd109ba28e701ab326b02f49e701e /drivers/iommu/omap-iommu-debug.c | |
parent | 0bcfa628f8a303f86876424475ba5390d229e736 (diff) | |
parent | 5cd3f2e98ccaa668210ed2e3a1d6bde3189fe366 (diff) | |
parent | 8dd8f005bdd45823fc153ef490239558caf6ff20 (diff) | |
parent | 9378bfeaafcbbdf234daeee93db31a3f2c815513 (diff) | |
parent | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (diff) | |
parent | 29fcea8ce7f3c16ebd267f8cb2f4a07887530aa9 (diff) | |
download | linux-d95c3885865b71e56d8d60c8617f2ce1f0fa079d.tar.xz |
Merge branches 'x86/vt-d', 'x86/amd', 'arm/smmu', 'arm/omap', 'generic-dma-ops' and 'core' into next