Merge git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <[email protected]>
Tue, 26 Sep 2017 23:38:04 +0000 (19:38 -0400)
committerTom Rini <[email protected]>
Tue, 26 Sep 2017 23:38:04 +0000 (19:38 -0400)

Trivial merge