Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Tue, 27 Sep 2016 14:47:37 +0000 (10:47 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 27 Sep 2016 14:47:37 +0000 (10:47 -0400)

Trivial merge