Merge branch 'master' of git://git.denx.de/u-boot-mmc
authorTom Rini <[email protected]>
Fri, 5 Aug 2016 13:15:55 +0000 (09:15 -0400)
committerTom Rini <[email protected]>
Sat, 6 Aug 2016 00:55:27 +0000 (20:55 -0400)

Trivial merge