Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Mon, 12 Aug 2013 12:48:49 +0000 (08:48 -0400)
committerTom Rini <trini@ti.com>
Mon, 12 Aug 2013 12:48:49 +0000 (08:48 -0400)

Trivial merge