Merge git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Tue, 6 Jun 2017 11:13:39 +0000 (07:13 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 6 Jun 2017 11:13:39 +0000 (07:13 -0400)

Trivial merge