tree 1f20b373eaf8c0d56b6d7d4feb7f285fd988f2c1
parent 8daf6bb8a5ec3d05a219e71f97d15b860f5d151b
parent cb898d8d229c704217d138cdfac4cd90d49da74d
author Tom Rini <trini@ti.com> 1379376170 -0400
committer Tom Rini <trini@ti.com> 1379376170 -0400

Merge branch 'master' of git://git.denx.de/u-boot-spi