Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Tue, 30 May 2017 18:07:23 +0000 (14:07 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 30 May 2017 18:07:23 +0000 (14:07 -0400)

Trivial merge