Merge git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Sun, 25 Mar 2018 16:02:13 +0000 (12:02 -0400)
committerTom Rini <trini@konsulko.com>
Sun, 25 Mar 2018 16:02:13 +0000 (12:02 -0400)

Trivial merge