Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <trini@konsulko.com>
Tue, 6 Sep 2016 15:28:37 +0000 (11:28 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 6 Sep 2016 15:28:37 +0000 (11:28 -0400)

Trivial merge