Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@ti.com>
Mon, 16 Feb 2015 13:44:03 +0000 (08:44 -0500)
committerTom Rini <trini@ti.com>
Mon, 16 Feb 2015 13:44:03 +0000 (08:44 -0500)

Trivial merge