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
..
2009-06-11 21:36:14 -04:00
2009-12-10 15:02:50 +01:00
2009-07-12 12:22:34 -07:00
2009-06-17 00:36:36 -04:00
2009-12-10 09:59:23 +02:00
2009-07-12 12:22:34 -07:00
2009-12-15 08:53:10 -08:00
2009-12-16 07:20:06 -08:00
2009-12-16 07:20:12 -08:00
2009-12-16 07:20:18 -08:00
2009-09-24 08:41:47 -04:00
2009-06-17 00:36:37 -04:00
2009-12-15 08:53:33 -08:00
2009-12-14 21:40:04 +01:00
2009-12-16 07:20:06 -08:00
2009-12-16 07:20:13 -08:00
2009-09-24 08:41:47 -04:00
2009-12-16 07:20:12 -08:00
2009-12-16 07:20:12 -08:00
2009-09-24 07:21:03 -07:00
2009-10-22 08:11:44 +09:00
2009-10-04 15:05:10 -07:00
2009-12-10 15:02:50 +01:00