Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Fri, 7 Jun 2013 12:34:34 +0000 (08:34 -0400)
committerTom Rini <trini@ti.com>
Fri, 7 Jun 2013 12:34:34 +0000 (08:34 -0400)

Trivial merge