Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Tue, 17 Sep 2013 00:02:50 +0000 (20:02 -0400)
committerTom Rini <trini@ti.com>
Tue, 17 Sep 2013 00:02:50 +0000 (20:02 -0400)

Trivial merge