alistair23-linux/drivers/mtd
Linus Torvalds 60d9aa758c Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (90 commits)
  jffs2: Fix long-standing bug with symlink garbage collection.
  mtd: OneNAND: Fix test of unsigned in onenand_otp_walk()
  mtd: cfi_cmdset_0002, fix lock imbalance
  Revert "mtd: move mxcnd_remove to .exit.text"
  mtd: m25p80: add support for Macronix MX25L4005A
  kmsg_dump: fix build for CONFIG_PRINTK=n
  mtd: nandsim: add support for 4KiB pages
  mtd: mtdoops: refactor as a kmsg_dumper
  mtd: mtdoops: make record size configurable
  mtd: mtdoops: limit the maximum mtd partition size
  mtd: mtdoops: keep track of used/unused pages in an array
  mtd: mtdoops: several minor cleanups
  core: Add kernel message dumper to call on oopses and panics
  mtd: add ARM pismo support
  mtd: pxa3xx_nand: Fix PIO data transfer
  mtd: nand: fix multi-chip suspend problem
  mtd: add support for switching old SST chips into QRY mode
  mtd: fix M29W800D dev_id and uaddr
  mtd: don't use PF_MEMALLOC
  mtd: Add bad block table overrides to Davinci NAND driver
  ...

Fixed up conflicts (mostly trivial) in
	drivers/mtd/devices/m25p80.c
	drivers/mtd/maps/pcmciamtd.c
	drivers/mtd/nand/pxa3xx_nand.c
	kernel/printk.c
2009-12-16 10:23:43 -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 git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
nand Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
onenand Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
tests mtd: make pagetest work 2009-11-30 10:02:41 +00:00
ubi Merge git://git.infradead.org/ubifs-2.6 2009-12-10 09:31:45 -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.c
mtdblock_ro.c
mtdchar.c
mtdconcat.c
mtdcore.c mtd: ensure index is positive 2009-11-30 09:50:46 +00:00
mtdcore.h
mtdoops.c mtd: mtdoops: refactor as a kmsg_dumper 2009-11-30 12:02:07 +00:00
mtdpart.c
mtdsuper.c
nftlcore.c
nftlmount.c
ofpart.c
redboot.c
rfd_ftl.c
ssfdc.c