Tom Rini 4b210ad342 Merge branch 'master' of git://git.denx.de/u-boot-arm ...

Conflicts:
	board/samsung/trats2/trats2.c
	include/configs/exynos5250-dt.h

Signed-off-by: Tom Rini <trini@ti.com>

2013-12-10 17:15:18 -05:00

..

nand

Merge branch 'u-boot/master' into 'u-boot-arm/master'

2013-12-10 22:23:59 +01:00

onenand

mtd: move & update nand_ecclayout structure (plus board changes)

2013-11-21 13:32:43 -06:00

spi

Merge branch 'spi' of git://git.denx.de/u-boot-x86

2013-12-10 09:36:23 -05:00

ubi

drivers: mtd: convert makefiles to Kbuild style

2013-10-31 13:22:13 -04:00

at45.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

cfi_flash.c

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash

2013-07-26 15:29:08 -04:00

cfi_mtd.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

dataflash.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

ftsmc020.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

jedec_flash.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00

Makefile

drivers: mtd: convert makefiles to Kbuild style

2013-10-31 13:22:13 -04:00

mtdconcat.c

mtd: resync with Linux-3.7.1

2013-05-31 17:12:03 -05:00

mtdcore.c

Coding Style cleanup: remove trailing empty lines

2013-10-14 16:06:54 -04:00

mtdpart.c

mtd: driver _read() returns max_bitflips; mtd_read() returns -EUCLEAN

2013-10-09 12:52:04 -05:00

mw_eeprom.c

Update i386 code (sc520_cdp)

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

st_smi.c

Add GPL-2.0+ SPDX-License-Identifier to source files

2013-07-24 09:44:38 -04:00