Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Thu, 12 Jul 2018 13:47:39 +0000 (09:47 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 12 Jul 2018 13:47:39 +0000 (09:47 -0400)

Trivial merge