Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Thu, 9 Jan 2014 16:05:32 +0000 (11:05 -0500)
committerTom Rini <trini@ti.com>
Thu, 9 Jan 2014 16:05:32 +0000 (11:05 -0500)

Trivial merge