Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Fri, 14 Sep 2018 17:54:37 +0000 (13:54 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 14 Sep 2018 17:54:37 +0000 (13:54 -0400)

Trivial merge