Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Fri, 30 Jan 2015 18:56:15 +0000 (13:56 -0500)
committerTom Rini <trini@ti.com>
Fri, 30 Jan 2015 18:56:15 +0000 (13:56 -0500)

Trivial merge