Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:44:28 +0000 (13:44 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 24 Apr 2015 17:44:28 +0000 (13:44 -0400)

Trivial merge