]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f8b398f 64f2c93)
Merge branch 'for-joerg/arm-smmu/fixes' into for-joerg/arm-smmu/updates
authorWill Deacon <will@kernel.org>
Mon, 4 Nov 2019 19:33:59 +0000 (19:33 +0000)
committerWill Deacon <will@kernel.org>
Mon, 4 Nov 2019 19:33:59 +0000 (19:33 +0000)
commite5123c7c8b9243166a1f935174dfc96de4c2bf81
tree9cdb0f3b94ecc882365eba42fbbfa4a6ddb1fd55tree | snapshot
parentf8b398fd0243e94ee39eaa7b04de6fcc5402d81ccommit | diff
parent64f2c9308345c1929e6910af1dc8da9df6dd41c6commit | 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
drivers/iommu/arm-smmu.c diff1 | diff2 | blob | history
drivers/iommu/io-pgtable-arm.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.