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

author Tom Rini <trini@konsulko.com>

Sat, 8 Oct 2016 02:02:10 +0000 (22:02 -0400)

committer Tom Rini <trini@konsulko.com>

Sat, 8 Oct 2016 13:33:37 +0000 (09:33 -0400)
author Tom Rini <trini@konsulko.com>
Sat, 8 Oct 2016 02:02:10 +0000 (22:02 -0400)
committer Tom Rini <trini@konsulko.com>
Sat, 8 Oct 2016 13:33:37 +0000 (09:33 -0400)
diff --cc Makefile
Simple merge
diff --cc arch/arm/dts/Makefile
Simple merge
author	Tom Rini <trini@konsulko.com>
	Sat, 8 Oct 2016 02:02:10 +0000 (22:02 -0400)
committer	Tom Rini <trini@konsulko.com>
	Sat, 8 Oct 2016 13:33:37 +0000 (09:33 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history