Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Fri, 14 Apr 2017 13:05:46 +0000 (09:05 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 14 Apr 2017 13:05:46 +0000 (09:05 -0400)

Trivial merge