Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@konsulko.com>
Mon, 4 Jan 2016 15:53:50 +0000 (10:53 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 4 Jan 2016 15:53:50 +0000 (10:53 -0500)

Trivial merge