Merge git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Thu, 10 May 2018 11:17:14 +0000 (07:17 -0400)
committerTom Rini <trini@konsulko.com>
Thu, 10 May 2018 11:17:14 +0000 (07:17 -0400)

Trivial merge