2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
linux-next/drivers/mtd/devices
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
..
block2mtd.c [PATCH] propagate mode through open_bdev_excl/close_bdev_excl 2008-10-21 07:49:00 -04:00
doc2000.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
doc2001plus.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
docecc.c [MTD] we don't need no misc devices 2009-03-20 13:16:26 +00:00
docprobe.c [MTD] [NAND] remove __PPC__ hardcoded address from DiskOnChip drivers 2008-07-11 18:21:54 +01:00
Kconfig Kconfig: Remove useless and sometimes wrong comments 2009-11-09 09:40:56 +01:00
lart.c mtd: lart: Prevent a read from mtd->eraseregions[-1] 2009-09-19 11:18:15 -07:00
m25p80.c Merge git://git.infradead.org/mtd-2.6 2009-12-16 10:23:43 -08:00
Makefile mtd: SST25L (non JEDEC) SPI Flash driver 2009-09-19 10:54:45 -07:00
ms02-nv.c MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
ms02-nv.h MTD/JFFS2: remove CVS keywords 2008-06-04 17:50:17 +01:00
mtd_dataflash.c mtd: fix memory leak in mtd_dataflash 2009-10-17 15:41:11 +01:00
mtdram.c NOMMU: Present backing device capabilities for MTD chardevs 2009-03-24 09:00:19 +00:00
phram.c phram: cleanup error handling and associated messages 2009-09-19 13:11:12 -07:00
pmc551.c trivial: fix then -> than typos in comments and documentation 2009-01-06 11:28:06 +01:00
slram.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
sst25l.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00