Merge git://git.denx.de/u-boot-marvell

author Tom Rini <trini@konsulko.com>

Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)

committer Tom Rini <trini@konsulko.com>

Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
author Tom Rini <trini@konsulko.com>
Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
committer Tom Rini <trini@konsulko.com>
Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
diff --cc Makefile
Simple merge
diff --cc scripts/Makefile.spl
Simple merge
author	Tom Rini <trini@konsulko.com>
	Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
committer	Tom Rini <trini@konsulko.com>
	Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/Makefile.spl	patch \|	diff1 \|	diff2 \|	blob \| history