Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@ti.com>
Fri, 12 Dec 2014 20:02:00 +0000 (15:02 -0500)
committerTom Rini <trini@ti.com>
Fri, 12 Dec 2014 20:02:00 +0000 (15:02 -0500)

Trivial merge