Merge branch 'master' of git://www.denx.de/git/u-boot-mmc
authorTom Rini <trini@ti.com>
Tue, 7 May 2013 14:09:00 +0000 (10:09 -0400)
committerTom Rini <trini@ti.com>
Tue, 7 May 2013 14:09:00 +0000 (10:09 -0400)

Trivial merge