Merge branch 'master' of git://git.denx.de/u-boot-sh
authorTom Rini <trini@konsulko.com>
Thu, 30 Aug 2018 14:15:03 +0000 (10:15 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 30 Aug 2018 14:15:03 +0000 (10:15 -0400)

Trivial merge