Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Thu, 31 Jan 2013 00:26:38 +0000 (19:26 -0500)
committerTom Rini <trini@ti.com>
Thu, 31 Jan 2013 00:26:38 +0000 (19:26 -0500)

Trivial merge