Merge git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Fri, 13 Apr 2018 13:23:53 +0000 (09:23 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 13 Apr 2018 13:23:53 +0000 (09:23 -0400)

Trivial merge