Merge branch 'for-thierry/arm-smmu' of https://git.kernel.org/pub/scm/linux/kernel...
authorKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Fri, 11 Jun 2021 06:35:11 +0000 (08:35 +0200)
committerKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Fri, 11 Jun 2021 06:36:04 +0000 (08:36 +0200)
commitce7fc8e77bc3bb85ed18a735e558be9aada9e632
tree52c89fc16374d2749ea6e7d48773926377de5a24
parentc7c65703260c88a3e4d7387b2d03023c3625c6d4
parent0d97174aeadfc49ad8d281bbcd69fdfeb5fd2fcb
Merge branch 'for-thierry/arm-smmu' of https://git./linux/kernel/git/will/linux into for-v5.14/tegra-mc

Pull ARM SMMU driver change from Will Deacon to resolve dependencies
between memory controllers, Tegra ARM SoC and ARM SMMU drivers trees.

Further ARM SMMU changes for Tegra depend on the change in Will's tree
and on Tegra memory controllers drivers work done before by Thierry
Reding.  Pulling Will's tree allows to apply the rest of this ARM SMMU
Tegra work via memory controllers drivers tree.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>