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

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

Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)

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

Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)
diff --cc Documentation/arm/sunxi/README
Simple merge
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
diff --cc arch/arm64/Kconfig.platforms
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 00:39:58 +0000 (10:39 +1000)
		1	2
Documentation/arm/sunxi/README	patch \|	diff1 \|	diff2 \|	blob \| history
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig.platforms	patch \|	diff1 \|	diff2 \|	blob \| history