Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Wed, 23 Apr 2014 15:07:11 +0000 (11:07 -0400)
committerTom Rini <trini@ti.com>
Wed, 23 Apr 2014 15:07:11 +0000 (11:07 -0400)

Trivial merge