Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Tue, 18 Aug 2015 12:25:24 +0000 (08:25 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 18 Aug 2015 12:25:24 +0000 (08:25 -0400)

Trivial merge