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

diff --cc drivers/iommu/arm-smmu.c
Simple merge

diff --cc drivers/iommu/io-pgtable-arm.c
Simple merge