Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Wed, 16 May 2018 21:32:59 +0000 (17:32 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 16 May 2018 21:32:59 +0000 (17:32 -0400)

Trivial merge