Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Mon, 3 Nov 2014 17:46:12 +0000 (12:46 -0500)
committerTom Rini <trini@ti.com>
Mon, 3 Nov 2014 17:46:12 +0000 (12:46 -0500)

Trivial merge