Merge branch 'CR_971_temp_sensor_samin.guo' into 'jh7110-5.15.y-devel'

author andy.hu <andy.hu@starfivetech.com>

Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)

committer andy.hu <andy.hu@starfivetech.com>

Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)
author andy.hu <andy.hu@starfivetech.com>
Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)
committer andy.hu <andy.hu@starfivetech.com>
Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)
diff --cc arch/riscv/boot/dts/starfive/jh7110-common.dtsi

index 9e3a6a5,a30b17c..0c30eb1

mode 100644,100755..100644
--- 1/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
--- 2/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110-common.dtsi
diff --cc arch/riscv/boot/dts/starfive/jh7110.dtsi
Simple merge
author	andy.hu <andy.hu@starfivetech.com>
	Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)
committer	andy.hu <andy.hu@starfivetech.com>
	Thu, 19 May 2022 09:01:03 +0000 (09:01 +0000)
		1	2
arch/riscv/boot/dts/starfive/jh7110-common.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/boot/dts/starfive/jh7110.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history