Merge branch 'master' of git://git.denx.de/u-boot-ubi
authorTom Rini <trini@ti.com>
Wed, 4 Feb 2015 18:30:00 +0000 (13:30 -0500)
committerTom Rini <trini@ti.com>
Wed, 4 Feb 2015 18:30:00 +0000 (13:30 -0500)

Trivial merge