Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Thu, 26 May 2016 00:22:48 +0000 (20:22 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 26 May 2016 00:22:48 +0000 (20:22 -0400)

Trivial merge