Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Sun, 23 Sep 2018 19:14:12 +0000 (15:14 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 23 Sep 2018 19:14:12 +0000 (15:14 -0400)

Trivial merge