Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Wed, 17 Jul 2013 01:05:35 +0000 (21:05 -0400)
committerTom Rini <trini@ti.com>
Wed, 17 Jul 2013 01:05:35 +0000 (21:05 -0400)

Trivial merge