Merge git://git.denx.de/u-boot-dm
authorTom Rini <[email protected]>
Mon, 25 Jun 2018 14:57:07 +0000 (10:57 -0400)
committerTom Rini <[email protected]>
Mon, 25 Jun 2018 14:57:07 +0000 (10:57 -0400)

Trivial merge