Merge branch 'master' of http://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Fri, 28 Oct 2016 13:08:13 +0000 (09:08 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 28 Oct 2016 13:08:13 +0000 (09:08 -0400)

Trivial merge