Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Wed, 10 May 2017 19:50:21 +0000 (15:50 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 10 May 2017 19:50:21 +0000 (15:50 -0400)

Trivial merge