Tony Lindgren d702d12167 Merge with mainline to remove plat-omap/Kconfig conflict ...

Conflicts:
	arch/arm/plat-omap/Kconfig

2010-03-01 14:19:05 -08:00

..

chips

Merge git://git.infradead.org/mtd-2.6

2009-12-16 10:23:43 -08:00

devices

Merge git://git.infradead.org/mtd-2.6

2009-12-16 10:23:43 -08:00

lpddr

…

maps

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

nand

Merge with mainline to remove plat-omap/Kconfig conflict

2010-03-01 14:19:05 -08:00

onenand

Merge git://git.infradead.org/mtd-2.6

2009-12-16 10:23:43 -08:00

tests

mtd: tests: fix read, speed and stress tests on NOR flash

2010-01-13 09:06:17 +00:00

ubi

Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

2010-01-28 12:57:50 -08:00

afs.c

…

ar7part.c

…

cmdlinepart.c

…

ftl.c

…

inftlcore.c

…

inftlmount.c

…

internal.h

…

Kconfig

…

Makefile

…

mtd_blkdevs.c

Merge git://git.infradead.org/mtd-2.6

2009-12-16 10:23:43 -08:00

mtdbdi.c

…

mtdblock_ro.c

…

mtdblock.c

…

mtdchar.c

…

mtdconcat.c

…

mtdcore.c

mtd: ensure index is positive

2009-11-30 09:50:46 +00:00

mtdcore.h

…

mtdoops.c

kmsg_dump: Dump on crash_kexec as well

2009-12-31 19:45:04 +00:00

mtdpart.c

…

mtdsuper.c

…

nftlcore.c

…

nftlmount.c

…

ofpart.c

…

redboot.c

…

rfd_ftl.c

…

ssfdc.c

…