Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 20:07:44 +0000 (15:07 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 11 Dec 2015 20:07:44 +0000 (15:07 -0500)

Trivial merge