Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@ti.com>
Fri, 10 Oct 2014 13:45:16 +0000 (09:45 -0400)
committerTom Rini <trini@ti.com>
Fri, 10 Oct 2014 13:45:16 +0000 (09:45 -0400)

Trivial merge