Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Mon, 2 Dec 2013 13:44:28 +0000 (08:44 -0500)
committerTom Rini <trini@ti.com>
Mon, 2 Dec 2013 13:44:28 +0000 (08:44 -0500)

Trivial merge