Tom Rini 76b40ab41e Merge u-boot/master into u-boot-ti/master ... In master we had already taken a patch to fix the davinci GPIO code for CONFIG_SOC_DM646X and in u-boot-ti we have additional patches to support DA830 (which is CONFIG_SOC_DA8XX && !CONFIG_SOC_DA850). Resolve these conflicts manually and comment the #else/#endif lines for clarity. Conflicts: arch/arm/include/asm/arch-davinci/gpio.h drivers/gpio/da8xx_gpio.c Signed-off-by: Tom Rini <trini@ti.com>		2013-03-11 12:16:13 -04:00
..
nand	mtd: nand: Check if NAND is locked tight before lock cmds	2013-02-22 19:06:34 -06:00
onenand	SPL: ONENAND: Fix onenand_spl_load_image implementation.	2013-03-08 16:41:14 -05:00
spi	sf: stmicro: Add support for N25Q256A	2013-02-06 10:10:00 -05:00
ubi	include/linux/byteorder: import latest endian definitions from linux	2012-11-04 11:00:34 -07:00
at45.c	drivers/mtd: Move conditional compilation to Makefile	2008-08-13 01:40:42 +02:00
cfi_flash.c	cfi_flash: Report Advanced Sector Protection (PPB) with flinfo cmd	2013-01-10 14:40:00 +01: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	linux/compat.h: rename from linux/mtd/compat.h	2012-04-30 16:54:51 +02: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