linux/drivers/mtd/devices
David Woodhouse 67577927e8 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
	drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
2010-10-30 12:35:11 +01:00
..
block2mtd.c block2mtd: dubious assignment 2010-10-26 10:58:00 +01:00
doc2000.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001plus.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
docecc.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
docprobe.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
Kconfig Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
lart.c Update broken web addresses in the kernel. 2010-10-18 11:03:14 +02:00
m25p80.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 2010-10-30 12:35:11 +01:00
Makefile mtd: small typo in Makefile 2010-03-18 07:53:16 +00:00
ms02-nv.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ms02-nv.h MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mtd_dataflash.c mtd: dataflash: remove casts from void 2010-08-02 09:05:46 +01:00
mtdram.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
phram.c mtd: phram: use KBUILD_MODNAME 2010-10-25 01:36:36 +01:00
pmc551.c mtd: Remove obsolete <mtd/compatmac.h> include 2010-08-08 21:19:42 +01:00
slram.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
sst25l.c mtd: sst25l: check for null consistently 2010-08-02 09:00:45 +01:00