Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Mon, 12 Dec 2016 12:19:28 +0000 (07:19 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 12 Dec 2016 12:19:28 +0000 (07:19 -0500)

Trivial merge