Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Mon, 2 Apr 2018 00:36:39 +0000 (20:36 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 2 Apr 2018 00:36:39 +0000 (20:36 -0400)

Trivial merge