Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Thu, 14 Sep 2017 01:35:45 +0000 (21:35 -0400)
committerTom Rini <[email protected]>
Thu, 14 Sep 2017 01:35:45 +0000 (21:35 -0400)

Trivial merge