Merge git://git.denx.de/u-boot-ubi
authorTom Rini <[email protected]>
Tue, 6 Feb 2018 17:17:00 +0000 (12:17 -0500)
committerTom Rini <[email protected]>
Tue, 6 Feb 2018 17:17:00 +0000 (12:17 -0500)

Trivial merge