2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
linux-next/include/linux/mtd
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
..
bbm.h mtd: use bbm.h in nand.h 2009-09-24 12:54:59 -07:00
blktrans.h Support 'discard sectors' operation in translation layer support core 2008-10-09 08:56:01 +02:00
cfi_endian.h
cfi.h mtd: move manufacturer to the common cfi.h header file 2009-11-30 09:51:26 +00:00
compatmac.h
concat.h mtd: struct device - replace bus_id with dev_name(), dev_set_name() 2009-01-06 10:44:38 -08:00
doc2000.h
flashchip.h mtd: OneNAND: multiblock erase support 2009-11-30 09:43:18 +00:00
ftl.h [MTD] Remove strange u_int32_t types from FTL 2008-12-10 14:06:42 +00:00
gen_probe.h
inftl.h
map.h [MTD] LPDDR added new pfow_base parameter 2009-01-05 13:56:08 +01:00
mtd.h mtd: fix the conversion from dev to mtd_info 2009-08-03 14:16:01 +01:00
mtdram.h
nand_ecc.h mtd: Add __nand_calculate_ecc() to NAND ECC functions 2009-11-30 09:32:19 +00:00
nand-gpio.h [MTD] [NAND] GPIO NAND flash driver 2008-10-18 12:48:42 +01:00
nand.h mtd: nand: add option to quieten off the no device found messgae 2009-11-30 09:48:31 +00:00
ndfc.h
nftl.h
onenand_regs.h mtd: OneNAND: multiblock erase support 2009-11-30 09:43:18 +00:00
onenand.h mtd: OneNAND OTP support rework 2009-11-30 09:31:13 +00:00
partitions.h Nicolas Pitre has a new email address 2009-09-15 09:37:12 -07:00
pfow.h [MTD] LPDDR PFOW definition 2009-01-05 13:55:58 +01:00
physmap.h [MTD] LPDDR extended physmap driver to support LPDDR flash 2009-01-05 13:57:28 +01:00
plat-ram.h
pmc551.h
qinfo.h [MTD] LPDDR QINFO records definitions 2009-01-05 13:55:54 +01:00
sh_flctl.h [MTD] [NAND] sh_flctl: add support for Renesas SuperH FLCTL 2008-10-14 13:33:05 +01:00
sharpsl.h [MTD] sharpsl-nand: use platform_data for model-specific values 2008-10-29 21:06:38 +03:00
super.h
ubi.h UBI: Add ubi_open_volume_path 2009-11-24 08:18:54 +02:00
xip.h