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
doc2001.c
doc2001plus.c
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
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
ms02-nv.h
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
sst25l.c	mtd: sst25l: check for null consistently	2010-08-02 09:00:45 +01:00