Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:32:18 +0000 (13:32 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 25 Apr 2016 17:32:18 +0000 (13:32 -0400)

Trivial merge