Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@konsulko.com>
Mon, 25 May 2015 01:01:30 +0000 (21:01 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 25 May 2015 01:01:30 +0000 (21:01 -0400)

Trivial merge