Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Fri, 25 Mar 2016 16:57:18 +0000 (12:57 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 25 Mar 2016 16:57:18 +0000 (12:57 -0400)

Trivial merge