Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@ti.com>
Fri, 6 Feb 2015 17:02:59 +0000 (12:02 -0500)
committerTom Rini <trini@ti.com>
Fri, 6 Feb 2015 17:02:59 +0000 (12:02 -0500)

Trivial merge