Merge git://www.denx.de/git/u-boot-cfi-flash
authorTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 12:11:53 +0000 (07:11 -0500)
committerTom Rini <trini@konsulko.com>
Mon, 30 Nov 2015 12:11:53 +0000 (07:11 -0500)

Trivial merge