Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Tue, 31 May 2016 14:26:14 +0000 (10:26 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 31 May 2016 14:26:14 +0000 (10:26 -0400)

Trivial merge