Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 21:17:06 +0000 (17:17 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 31 Mar 2015 21:17:06 +0000 (17:17 -0400)

Trivial merge