Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Sat, 13 May 2017 20:45:35 +0000 (16:45 -0400)
committerTom Rini <trini@konsulko.com>
Sat, 13 May 2017 20:45:35 +0000 (16:45 -0400)

Trivial merge