Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 18:27:26 +0000 (13:27 -0500)
committerTom Rini <trini@konsulko.com>
Thu, 19 Nov 2015 18:27:26 +0000 (13:27 -0500)

Trivial merge