Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Fri, 28 Mar 2014 12:24:01 +0000 (08:24 -0400)
committerTom Rini <trini@ti.com>
Fri, 28 Mar 2014 12:24:01 +0000 (08:24 -0400)

Trivial merge