Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Thu, 19 Dec 2013 19:22:12 +0000 (14:22 -0500)
committerTom Rini <trini@ti.com>
Thu, 19 Dec 2013 19:22:12 +0000 (14:22 -0500)

Trivial merge