Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20
authorBjorn Andersson <bjorn.andersson@linaro.org>
Sun, 3 Jul 2022 03:03:46 +0000 (22:03 -0500)
committerBjorn Andersson <bjorn.andersson@linaro.org>
Sun, 3 Jul 2022 03:17:36 +0000 (22:17 -0500)
commit817c2f3519745749e60ea35d9be676819bb2fe6a
tree6f9aab9df75a1d96519459ec4e4480d2dfddd6d1
parenta10b760b7402563661fa305882b181a75a1d4894
parent5fb779558f1c97e2bf2794cb59553e569c38e2f9
Merge tag 'qcom-arm64-fixes-for-5.19' into arm64-for-5.20

This merges the 'qcom-arm64-fixes-for-5.19' tag into arm64-for-5.20 to
handle the merge conflict related to the header file changes in
sc7180-trogdor.
arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts
arch/arm64/boot/dts/qcom/msm8994.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi
arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi
arch/arm64/boot/dts/qcom/sdm845.dtsi
arch/arm64/boot/dts/qcom/sm8450.dtsi