Merge branch 'master' of git://www.denx.de/git/u-boot-ubi
authorTom Rini <trini@ti.com>
Wed, 12 Sep 2012 17:26:48 +0000 (10:26 -0700)
committerTom Rini <trini@ti.com>
Wed, 12 Sep 2012 17:26:48 +0000 (10:26 -0700)

Trivial merge