Merge git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <trini@konsulko.com>
Tue, 27 Oct 2015 23:09:15 +0000 (19:09 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 27 Oct 2015 23:09:15 +0000 (19:09 -0400)

Trivial merge