Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Mon, 23 Feb 2015 21:18:06 +0000 (16:18 -0500)
committerTom Rini <trini@ti.com>
Mon, 23 Feb 2015 21:18:06 +0000 (16:18 -0500)

Trivial merge