Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:16:08 +0000 (14:16 -0500)
committerTom Rini <trini@ti.com>
Mon, 17 Feb 2014 19:16:08 +0000 (14:16 -0500)

Trivial merge