Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Fri, 8 Jun 2018 11:20:08 +0000 (07:20 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 8 Jun 2018 11:20:08 +0000 (07:20 -0400)

Trivial merge