Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Thu, 13 Jun 2013 19:18:35 +0000 (15:18 -0400)
committerTom Rini <trini@ti.com>
Thu, 13 Jun 2013 19:18:35 +0000 (15:18 -0400)
1  2 
drivers/mtd/spi/spansion.c

Simple merge