Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Mon, 19 Feb 2018 16:39:39 +0000 (11:39 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 19 Feb 2018 16:39:39 +0000 (11:39 -0500)

Trivial merge