Merge branch 'CR_1311_CPUIdle_mason.huo' into 'jh7110-5.15.y-devel'

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

Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)

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

Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)
author andy.hu <andy.hu@starfivetech.com>
Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)
committer andy.hu <andy.hu@starfivetech.com>
Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)
diff --cc arch/riscv/boot/dts/starfive/jh7110.dtsi

index 431adf4,212f638..4aebab0

mode 100644,100755..100644
--- 1/arch/riscv/boot/dts/starfive/jh7110.dtsi
--- 2/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
diff --cc arch/riscv/configs/starfive_jh7110_defconfig
Simple merge
author	andy.hu <andy.hu@starfivetech.com>
	Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)
committer	andy.hu <andy.hu@starfivetech.com>
	Fri, 8 Jul 2022 00:48:47 +0000 (00:48 +0000)
		1	2
arch/riscv/boot/dts/starfive/jh7110.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/riscv/configs/starfive_jh7110_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history