u-boot/drivers/mtd
Albert ARIBAUD 4b19b7448e Merge remote-tracking branch 'u-boot-imx/master'
The single file conflict below is actually trivial.

Conflicts:
	board/boundary/nitrogen6x/nitrogen6x.c
2014-10-08 21:20:49 +02:00
..
nand Merge remote-tracking branch 'u-boot-imx/master' 2014-10-08 21:20:49 +02:00
onenand mtd, ubi, ubifs: resync with Linux-3.14 2014-08-25 19:25:55 -04:00
spi sandbox: Convert SPI flash emulation to use sf_params 2014-09-26 15:00:36 -06:00
ubi kbuild: force to define __UBOOT__ in all the C sources 2014-09-16 12:23:56 -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 mtd: cfi_flash: fix clang warning 2014-07-18 17:53:22 -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
Kconfig mtd: denali: add Denali controller configs to Kconfig 2014-10-05 14:10:09 +09:00
Makefile drivers: mtd: convert makefiles to Kbuild style 2013-10-31 13:22:13 -04:00
mtdconcat.c kbuild: force to define __UBOOT__ in all the C sources 2014-09-16 12:23:56 -04:00
mtdcore.c mtdcore: Fix a build error with CONFIG_CMD_MTDPARTS_SPREAD 2014-09-16 12:23:59 -04:00
mtdcore.h mtd, ubi, ubifs: resync with Linux-3.14 2014-08-25 19:25:55 -04:00
mtdpart.c kbuild: force to define __UBOOT__ in all the C sources 2014-09-16 12:23:56 -04: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