Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Thu, 12 Jul 2018 01:55:20 +0000 (21:55 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 12 Jul 2018 01:55:20 +0000 (21:55 -0400)

Trivial merge