diff options
| author | Joerg Roedel <jroedel@suse.de> | 2021-06-25 15:23:25 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2021-06-25 15:23:25 +0200 |
| commit | 2b9d8e3e9a9bb693a8b8bd26ad192db037517759 (patch) | |
| tree | fa63d396dc6d231fb8dc513e6ad1eb6ce8fc1b72 /drivers/iommu/rockchip-iommu.c | |
| parent | 13311e74253fe64329390df80bed3f07314ddd61 (diff) | |
| parent | 340ec061f76502befea92d9913886991a60cf15e (diff) | |
| parent | c55356c534aa651ccc3053ef2d5d8d810adacf5f (diff) | |
| parent | 1c461ef9c49e654c9173a665f20e47d4bf0d9bfb (diff) | |
| parent | 934ed4580c0a13a49ab7c4cbf94cd1958c0679ed (diff) | |
| parent | b65412c25fa600d8a4085e820bdfadb9d9bab6b9 (diff) | |
| parent | 8ce4904bfd22de04ac3cd35d469c0a3337bdeb7b (diff) | |
| parent | 531353e650db087e61ce84f8e6b7e0982c1dc1b0 (diff) | |
Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/smmu', 'x86/vt-d', 'x86/amd', 'virtio' and 'core' into next