Merge git://www.denx.de/git/u-boot-marvell
authorTom Rini <[email protected]>
Wed, 1 Feb 2017 11:57:35 +0000 (06:57 -0500)
committerTom Rini <[email protected]>
Wed, 1 Feb 2017 11:57:35 +0000 (06:57 -0500)

Trivial merge