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

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

Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)

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

Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)
diff --cc arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
Simple merge
diff --cc arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
Simple merge
diff --cc arch/arm64/configs/defconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 7 Feb 2019 21:57:54 +0000 (08:57 +1100)
		1	2
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history