Merge git://git.denx.de/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Tue, 17 Nov 2015 22:57:32 +0000 (17:57 -0500)
committerTom Rini <trini@konsulko.com>
Tue, 17 Nov 2015 22:57:32 +0000 (17:57 -0500)

Trivial merge