Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Mon, 21 Aug 2017 11:17:15 +0000 (07:17 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 21 Aug 2017 11:17:15 +0000 (07:17 -0400)

Trivial merge