Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Thu, 27 Nov 2014 15:49:38 +0000 (10:49 -0500)
committerTom Rini <trini@ti.com>
Thu, 27 Nov 2014 15:49:38 +0000 (10:49 -0500)

Trivial merge