Merge branch 'master' of git://git.denx.de/u-boot-sunxi

author Tom Rini <trini@konsulko.com>

Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)

committer Tom Rini <trini@konsulko.com>

Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
author Tom Rini <trini@konsulko.com>
Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
committer Tom Rini <trini@konsulko.com>
Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc configs/Cubietruck_plus_defconfig
Simple merge
diff --cc configs/Sinovoip_BPI_M3_defconfig
Simple merge
diff --cc include/configs/sunxi-common.h
Simple merge
diff --cc include/reset.h
Simple merge
author	Tom Rini <trini@konsulko.com>
	Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
committer	Tom Rini <trini@konsulko.com>
	Wed, 8 May 2019 20:21:43 +0000 (16:21 -0400)
		1	2
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configs/Cubietruck_plus_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/Sinovoip_BPI_M3_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/sunxi-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/reset.h	patch \|	diff1 \|	diff2 \|	blob \| history