Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <trini@ti.com>
Sun, 17 Nov 2013 01:23:22 +0000 (20:23 -0500)
committerTom Rini <trini@ti.com>
Sun, 17 Nov 2013 19:11:34 +0000 (14:11 -0500)

Trivial merge