Albert ARIBAUD a19b0dd62d Merge branch 'u-boot/master' into 'u-boot-arm/master' ...

Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c

2013-05-30 14:45:06 +02:00

..

nand

Revert wrong removal of nand_init and nand_deselect

2013-05-11 22:23:04 +02:00

onenand

arm: Remove support for unused s3c64xx

2013-04-12 07:55:08 +02:00

spi

sf: spansion: Add support for S25FL128S

2013-05-24 16:54:13 -05:00

ubi

ubi: ubifs: Turn off verbose prints

2013-04-11 15:52:54 -04:00

at45.c

drivers/mtd: Move conditional compilation to Makefile

2008-08-13 01:40:42 +02:00

cfi_flash.c

cfi_flash: return NULL for invalid base address input

2013-05-23 09:48:45 +02:00

cfi_mtd.c

CFI: fix warning: variable ... set but not used

2011-10-09 23:24:49 +02:00

dataflash.c

drivers/mtd/dataflash.c: Fix GCC 4.6 warning

2011-11-16 21:28:47 +01:00

ftsmc020.c

ftsmc020: fix relocation

2011-05-12 23:43:27 +02:00

jedec_flash.c

add STM29F400BB to table of supported legacy flashs

2012-02-09 09:45:53 +01:00

Makefile

st_smi: Add support for SPEAr SMI driver

2012-07-07 14:07:38 +02:00

mtdconcat.c

linux/compat.h: rename from linux/mtd/compat.h

2012-04-30 16:54:51 +02:00

mtdcore.c

linux/compat.h: rename from linux/mtd/compat.h

2012-04-30 16:54:51 +02:00

mtdpart.c

ubi: ubifs: Turn off verbose prints

2013-04-11 15:52:54 -04:00

mw_eeprom.c

Update i386 code (sc520_cdp)

2008-09-09 11:48:53 +02:00

st_smi.c

MTD: SPEAr SMI: Add write support for length < 4 bytes

2012-07-07 14:07:44 +02:00