Merge git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 3 May 2018 13:20:02 +0000 (09:20 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 3 May 2018 13:20:02 +0000 (09:20 -0400)

Trivial merge