Merge git://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Mon, 25 Sep 2017 21:28:16 +0000 (17:28 -0400)
committerTom Rini <[email protected]>
Mon, 25 Sep 2017 21:28:16 +0000 (17:28 -0400)

Trivial merge