Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 26 Jul 2018 15:43:23 +0000 (11:43 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 26 Jul 2018 15:43:23 +0000 (11:43 -0400)

Trivial merge