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

author Tom Rini <trini@konsulko.com>

Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)

committer Tom Rini <trini@konsulko.com>

Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)
committer Tom Rini <trini@konsulko.com>
Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)
diff --cc Makefile
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)
committer	Tom Rini <trini@konsulko.com>
	Thu, 11 Apr 2019 18:29:22 +0000 (14:29 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history