Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Tue, 20 Jan 2015 15:21:36 +0000 (10:21 -0500)
committerTom Rini <trini@ti.com>
Tue, 20 Jan 2015 15:21:36 +0000 (10:21 -0500)

Trivial merge