Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Tue, 8 Oct 2013 13:03:15 +0000 (09:03 -0400)
committerTom Rini <trini@ti.com>
Tue, 8 Oct 2013 13:03:15 +0000 (09:03 -0400)

Trivial merge