Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Wed, 11 Jun 2014 15:40:11 +0000 (11:40 -0400)
committerTom Rini <trini@ti.com>
Wed, 11 Jun 2014 15:40:11 +0000 (11:40 -0400)

Trivial merge