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

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

Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)

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

Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:59:37 +0000 (09:59 +1000)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history