Merge remote-tracking branch 'sunxi/sunxi/for-next' into master

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)
diff --cc Documentation/devicetree/bindings/arm/sunxi.yaml
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 29 Oct 2020 22:34:11 +0000 (09:34 +1100)
		1	2
Documentation/devicetree/bindings/arm/sunxi.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history