Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 23 Jul 2015 13:02:28 +0000 (09:02 -0400)
1  2 
Makefile
scripts/Makefile.spl

diff --cc Makefile
Simple merge
Simple merge