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
..
csp	tree-wide: fix misspelling of "definition" in comments	2009-12-04 23:41:47 +01:00
mach	Merge git://git.infradead.org/mtd-2.6	2009-12-16 10:23:43 -08:00
cfg_global_defines.h	ARM: 5643/1: bcmring: arch.c and header files	2009-08-15 16:01:38 +01:00
cfg_global.h	ARM: 5643/1: bcmring: arch.c and header files	2009-08-15 16:01:38 +01:00