Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Tue, 10 Dec 2013 14:33:13 +0000 (09:33 -0500)
committerTom Rini <trini@ti.com>
Tue, 10 Dec 2013 14:33:13 +0000 (09:33 -0500)

Trivial merge