tree 84d805197d0caba8143bd7275b17b8565ba8c68d
parent 374e837069bb5570266dcb41607dc983269702d7
parent 4bfd0002b653dfc9f9ddd8e9a4ce0acd40bde3ac
author Tom Rini <trini@ti.com> 1370608474 -0400
committer Tom Rini <trini@ti.com> 1370608474 -0400

Merge branch 'master' of git://git.denx.de/u-boot-nand-flash