Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Sun, 4 Nov 2018 13:12:21 +0000 (08:12 -0500)
committerTom Rini <trini@konsulko.com>
Sun, 4 Nov 2018 13:12:21 +0000 (08:12 -0500)

Trivial merge