Merge branch 'master' of git://www.denx.de/git/u-boot-mips
authorTom Rini <trini@ti.com>
Tue, 13 Aug 2013 12:58:47 +0000 (08:58 -0400)
committerTom Rini <trini@ti.com>
Tue, 13 Aug 2013 12:58:47 +0000 (08:58 -0400)

Trivial merge