Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Thu, 12 Jun 2014 13:02:23 +0000 (09:02 -0400)
committerTom Rini <trini@ti.com>
Thu, 12 Jun 2014 13:02:23 +0000 (09:02 -0400)

Trivial merge