OSDN Git Service

Merge branch 'arm64-fixes-for-6.1' into HEAD
authorBjorn Andersson <andersson@kernel.org>
Fri, 2 Dec 2022 17:09:58 +0000 (11:09 -0600)
committerBjorn Andersson <andersson@kernel.org>
Fri, 2 Dec 2022 17:09:58 +0000 (11:09 -0600)
Mergeback arm64-fixes-for-6.1 to avoid merge conflicts.

1  2 
arch/arm64/boot/dts/qcom/msm8996.dtsi
arch/arm64/boot/dts/qcom/sa8155p-adp.dts
arch/arm64/boot/dts/qcom/sa8295p-adp.dts
arch/arm64/boot/dts/qcom/sc7280.dtsi
arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
arch/arm64/boot/dts/qcom/sc8280xp.dtsi
arch/arm64/boot/dts/qcom/sm8250-sony-xperia-edo.dtsi
arch/arm64/boot/dts/qcom/sm8250.dtsi

Simple merge
Simple merge
Simple merge