Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 11:07:36 +0000 (07:07 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 26 Aug 2015 11:07:36 +0000 (07:07 -0400)

Trivial merge