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

Kconfig: Remove useless and sometimes wrong comments

2009-11-09 09:40:56 +01:00

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

mtd: afs: fix build warning

2009-09-04 09:38:14 +01:00

ar7part.c

[MTD] mtdpart: Make all partition parsers return allocated array

2009-03-20 18:55:17 +00:00

cmdlinepart.c

mtd: cmdlineparts: Use 64-bit format when printing a debug message.

2009-06-25 08:18:12 +01:00

ftl.c

trivial: mtd: add __init/__exit macros to init/exitfunctions

2009-09-21 15:14:53 +02:00

inftlcore.c

mtd: inftl: fix fold chain block number

2009-09-19 14:17:35 -07:00

inftlmount.c

[MTD] we don't need no misc devices

2009-03-20 13:16:26 +00:00

internal.h

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00:00

Kconfig

Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze

2009-09-24 09:01:44 -07:00

Makefile

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00:00

mtd_blkdevs.c

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

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

mtdbdi.c

NOMMU: Present backing device capabilities for MTD chardevs

2009-03-24 09:00:19 +00:00

mtdblock_ro.c

MTD/JFFS2: remove CVS keywords

2008-06-04 17:50:17 +01:00

mtdblock.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-20 05:55:36 -07:00

mtdchar.c

mtd: Fix pointer handling in compat ioctls to use compat_ptr()

2009-05-29 16:09:08 +01:00

mtdconcat.c

mtd: mtdconcat: prevent a read from eraseregions[-1]

2009-09-19 11:18:46 -07:00

mtdcore.c

mtd: ensure index is positive

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

mtdcore.h

[MTD] mtdcore.c: share syms with mtd_blkdev.c

2007-06-28 20:24:50 +01:00

mtdoops.c

kmsg_dump: Dump on crash_kexec as well

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

mtdpart.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2009-09-20 05:55:36 -07:00

mtdsuper.c

Convert obvious places to deactivate_locked_super()

2009-05-09 10:49:40 -04:00

nftlcore.c

mtd: nftl: fix offset alignments

2009-09-03 14:59:16 +01:00

nftlmount.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00

ofpart.c

mtd: ofpart: Check availability of reg property instead of name property

2009-09-19 14:14:48 -07:00

redboot.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-07-11 14:36:25 +01:00

rfd_ftl.c

[MTD] remove private wrapper of endian helpers in rfd_ftl.c

2008-12-10 15:39:09 +00:00

ssfdc.c

[MTD] update internal API to support 64-bit device size

2008-12-10 13:37:21 +00:00