Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Tue, 18 Sep 2012 14:55:07 +0000 (07:55 -0700)
committerTom Rini <trini@ti.com>
Tue, 18 Sep 2012 14:55:07 +0000 (07:55 -0700)

Trivial merge