Skip to content
Commit b9e6e8ae authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'arm/smmu/updates' into next 

* arm/smmu/updates:
  iommu/arm-smmu: disable PRR on SM8250
  iommu/arm-smmu-v3: Revert vmaster in the error path
  iommu/io-pgtable-arm: Remove unused macro iopte_prot
parents aaac6e2f b9bb7e81
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment