Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Mon, 13 Jan 2014 18:45:15 +0000 (13:45 -0500)
committerTom Rini <trini@ti.com>
Mon, 13 Jan 2014 18:45:15 +0000 (13:45 -0500)

Trivial merge