Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Thu, 17 May 2018 16:38:30 +0000 (12:38 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 17 May 2018 16:38:30 +0000 (12:38 -0400)

Trivial merge