Merge git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Fri, 27 Apr 2018 02:08:58 +0000 (22:08 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 27 Apr 2018 02:08:58 +0000 (22:08 -0400)

Trivial merge