Merge branch 'next' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Fri, 2 May 2014 15:48:07 +0000 (11:48 -0400)
committerTom Rini <trini@ti.com>
Fri, 2 May 2014 15:48:07 +0000 (11:48 -0400)

Trivial merge