Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Thu, 13 Aug 2015 11:20:44 +0000 (07:20 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 13 Aug 2015 11:20:44 +0000 (07:20 -0400)

Trivial merge