Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Sun, 16 Sep 2018 14:29:39 +0000 (10:29 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 16 Sep 2018 14:29:39 +0000 (10:29 -0400)

Trivial merge