Merge git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <[email protected]>
Sat, 26 Aug 2017 19:10:35 +0000 (15:10 -0400)
committerTom Rini <[email protected]>
Sat, 26 Aug 2017 19:10:35 +0000 (15:10 -0400)

Trivial merge