diff options
author | Joerg Roedel <jroedel@suse.de> | 2020-01-24 17:39:39 +0300 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2020-01-24 17:39:39 +0300 |
commit | e3b5ee0cfb65646f4a915643fe53e0a51829d891 (patch) | |
tree | 6d90938f771c9a1ffdda237c3a67fc1701bda578 /drivers/iommu/arm-smmu.c | |
parent | 8c17bbf6c8f70058a66305f2e1982552e6ea7f47 (diff) | |
parent | 6855d1ba7537e21e8f36988bad36d1ad76841f1d (diff) | |
parent | 154e3a65f404cfd5fbb7f49df01905d4ad025264 (diff) | |
parent | 857f081426e5aa38313426c13373730f1345fe95 (diff) | |
parent | c11738cf9d2931c2dbdc44b984ba03519cdeb7fb (diff) | |
download | linux-e3b5ee0cfb65646f4a915643fe53e0a51829d891.tar.xz |
Merge branches 'iommu/fixes', 'arm/smmu', 'x86/amd', 'x86/vt-d' and 'core' into next