Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Thu, 9 Aug 2018 00:02:39 +0000 (20:02 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 9 Aug 2018 00:02:39 +0000 (20:02 -0400)

Trivial merge