Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 12:51:21 +0000 (08:51 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 13 Jun 2016 12:51:21 +0000 (08:51 -0400)

Trivial merge