Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Fri, 8 Jun 2018 14:08:20 +0000 (10:08 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 8 Jun 2018 14:08:20 +0000 (10:08 -0400)

Trivial merge