Stefan Roese f2302d4430 Fix merge problems ... Signed-off-by: Stefan Roese <sr@denx.de>		2008-08-06 14:05:38 +02:00
..
Makefile	SPI Flash subsystem	2008-06-03 20:31:34 +02:00
atmel.c	Fix merge problems	2008-08-06 14:05:38 +02:00
spi_flash.c	SPI Flash subsystem	2008-06-03 20:31:34 +02:00
spi_flash_internal.h	SPI Flash subsystem	2008-06-03 20:31:34 +02:00