Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Wed, 5 Mar 2014 02:23:42 +0000 (21:23 -0500)
committerTom Rini <trini@ti.com>
Wed, 5 Mar 2014 02:23:42 +0000 (21:23 -0500)

Trivial merge