Albert ARIBAUD 009d75ccc1 Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Conflicts: drivers/spi/tegra20_sflash.c include/fdtdec.h lib/fdtdec.c		2013-03-28 18:50:01 +01:00
..
atmel.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
eeprom_m95xxx.c	sf: eeprom_m95xxx: set a sane default timeout	2012-02-12 15:18:28 -05:00
eon.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
macronix.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
Makefile	sf: Add spi_boot() to allow booting from SPI flash in an SPL	2011-12-24 10:23:30 +01:00
ramtron.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
spansion.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
spi_flash.c	sf: Enable FDT-based configuration and memory mapping	2013-03-19 08:45:37 -07:00
spi_flash_internal.h	sf: unify status register writing (and thus block unlocking)	2012-03-04 23:18:17 -05:00
spi_spl_load.c	SPL: SPI: Enhance spi_spl_load to match the other load functions	2012-09-27 11:20:27 -07:00
sst.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
stmicro.c	sf: Use spi_flash_alloc() in each SPI flash driver	2013-03-19 08:45:36 -07:00
winbond.c	Merge branch 'u-boot/master' into 'u-boot-arm/master'	2013-03-28 18:50:01 +01:00