tree 181e94fa3326f2ec97f0287f3bbbe54ccd3b13d1
parent b3c833f563db63d9f52180a7ad8b81d3a0993b2c
parent 53b4b32b3338378b22284e276ca250b185c5311a
author Tom Rini <trini@ti.com> 1385394133 -0500
committer Tom Rini <trini@ti.com> 1385394133 -0500

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