| commit | db22a9de7a785fd3e0e066b02c269d6bdf453aec | [log] [tgz] |
|---|---|---|
| author | Will Deacon <will@kernel.org> | Mon Nov 04 19:33:59 2019 +0000 |
| committer | Will Deacon <will@kernel.org> | Mon Nov 04 19:33:59 2019 +0000 |
| tree | 9cdb0f3b94ecc882365eba42fbbfa4a6ddb1fd55 | |
| parent | 759aaa10c76cbaaefc0670410fb2d54cf4ec10cc [diff] | |
| parent | 1be08f458d1602275b02f5357ef069957058f3fd [diff] |
Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates Merge in ARM SMMU fixes to avoid conflicts in the ARM io-pgtable code. * for-joerg/arm-smmu/fixes: iommu/io-pgtable-arm: Support all Mali configurations iommu/io-pgtable-arm: Correct Mali attributes iommu/arm-smmu: Free context bitmap in the err path of arm_smmu_init_domain_context