Merge git://git.denx.de/u-boot-dm
authorTom Rini <trini@konsulko.com>
Tue, 4 Apr 2017 13:18:57 +0000 (09:18 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 4 Apr 2017 13:18:57 +0000 (09:18 -0400)

Trivial merge