Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Tue, 15 Mar 2016 12:01:04 +0000 (08:01 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 15 Mar 2016 12:01:04 +0000 (08:01 -0400)

Trivial merge