Merge git://git.denx.de/u-boot-nand-flash
authorTom Rini <[email protected]>
Sat, 4 Jun 2016 12:49:47 +0000 (08:49 -0400)
committerTom Rini <[email protected]>
Sat, 4 Jun 2016 12:49:47 +0000 (08:49 -0400)

Trivial merge