Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 21 Jun 2018 13:02:35 +0000 (09:02 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 21 Jun 2018 13:02:35 +0000 (09:02 -0400)

Trivial merge