Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Wed, 12 Dec 2012 13:51:02 +0000 (06:51 -0700)
committerTom Rini <trini@ti.com>
Wed, 12 Dec 2012 13:51:02 +0000 (06:51 -0700)

Trivial merge