Merge branch 'master' of http://git.denx.de/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Fri, 13 Jan 2017 14:17:21 +0000 (09:17 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 13 Jan 2017 14:17:21 +0000 (09:17 -0500)

Trivial merge