Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@ti.com>
Mon, 31 Mar 2014 12:29:35 +0000 (08:29 -0400)
committerTom Rini <trini@ti.com>
Mon, 31 Mar 2014 12:29:35 +0000 (08:29 -0400)

Trivial merge