linux-stable-rt/drivers/mtd/maps
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 Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
Makefile Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
alchemy-flash.c
amd76xrom.c
autcpu12-nvram.c
bfin-async-flash.c
cdb89712.c
ceiva.c
cfi_flagadm.c
ck804xrom.c
dbox2-flash.c
dc21285.c
dilnetpc.c
dmv182.c
edb7312.c
esb2rom.c
fortunet.c
gpio-addr-flash.c
h720x-flash.c
ichxrom.c
impa7.c
integrator-flash.c
intel_vr_nor.c
ixp4xx.c
ixp2000.c
l440gx.c
map_funcs.c
mbx860.c
netsc520.c
nettel.c
octagon-5066.c
omap_nor.c
pci.c
pcmciamtd.c
physmap.c
physmap_of.c
plat-ram.c
pmcmsp-flash.c
pxa2xx-flash.c
rbtx4939-flash.c
redwood.c
rpxlite.c
sa1100-flash.c
sbc_gxx.c
sc520cdp.c
scb2_flash.c
scx200_docflash.c
solutionengine.c
sun_uflash.c
tqm8xxl.c
ts5500_flash.c
tsunami_flash.c
uclinux.c
vmax301.c
vmu-flash.c
wr_sbc82xx_flash.c