Merge branch 'master' of git://git.denx.de/u-boot-spi
authorTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
committerTom Rini <trini@ti.com>
Mon, 24 Jun 2013 20:37:01 +0000 (16:37 -0400)
commitf9c1456cf632175afb7d6b27f42f1aab8432be0f
tree8bac21548110dbfdc2d0e571b8cd36be7ccda20c
parent348e47f766ac228fb02d1af562b2e9a4c69355db
parentb9e31be0f8adc1a55179ae3b45c9e274f4650007
Merge branch 'master' of git://git.denx.de/u-boot-spi
README
drivers/mtd/spi/spi_flash.c
drivers/mtd/spi/spi_flash_internal.h