Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Thu, 8 Jan 2015 18:50:38 +0000 (13:50 -0500)
committerTom Rini <trini@ti.com>
Thu, 8 Jan 2015 18:50:38 +0000 (13:50 -0500)

Trivial merge