Merge branch 'master' of git://www.denx.de/git/u-boot-marvell
authorTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 11:41:54 +0000 (07:41 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 26 Aug 2016 11:41:54 +0000 (07:41 -0400)

Trivial merge