Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Mon, 14 Oct 2013 13:37:51 +0000 (09:37 -0400)
committerTom Rini <trini@ti.com>
Mon, 14 Oct 2013 13:37:51 +0000 (09:37 -0400)

Trivial merge