Merge branch 'master' of git://git.denx.de/u-boot-marvell
authorTom Rini <trini@ti.com>
Mon, 26 Jan 2015 00:05:40 +0000 (19:05 -0500)
committerTom Rini <trini@ti.com>
Mon, 26 Jan 2015 00:05:40 +0000 (19:05 -0500)

Trivial merge