linux-sg2042/drivers/mtd/chips
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
..
Kconfig Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
Makefile [MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp) 2007-05-09 13:34:37 +01:00
cfi_cmdset_0001.c mtd: move manufacturer to the common cfi.h header file 2009-11-30 09:51:26 +00:00
cfi_cmdset_0002.c mtd: cfi_cmdset_0002, fix lock imbalance 2009-12-10 13:33:53 +00:00
cfi_cmdset_0020.c Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
cfi_probe.c [MTD] [NOR] Rename and export new cfi_qry_*() functions 2008-08-07 11:55:07 +01:00
cfi_util.c mtd: add support for switching old SST chips into QRY mode 2009-11-30 11:39:21 +00:00
chipreg.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
fwh_lock.h [MTD] update internal API to support 64-bit device size 2008-12-10 13:37:21 +00:00
gen_probe.c [MTD] Use DIV_ROUND_UP 2008-08-02 18:45:18 +01:00
jedec_probe.c mtd: fix M29W800D dev_id and uaddr 2009-11-30 11:38:32 +00:00
map_absent.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
map_ram.c NOMMU: Present backing device capabilities for MTD chardevs 2009-03-24 09:00:19 +00:00
map_rom.c NOMMU: Present backing device capabilities for MTD chardevs 2009-03-24 09:00:19 +00:00