Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Thu, 8 Nov 2018 12:15:29 +0000 (07:15 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 8 Nov 2018 12:15:29 +0000 (07:15 -0500)

Trivial merge