Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Wed, 10 Oct 2018 17:35:14 +0000 (13:35 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 10 Oct 2018 17:35:14 +0000 (13:35 -0400)

Trivial merge