linux/arch/cris/arch-v32/drivers
Linus Torvalds e0d65113a7 Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (226 commits)
  mtd: tests: annotate as DANGEROUS in Kconfig
  mtd: tests: don't use mtd0 as a default
  mtd: clean up usage of MTD_DOCPROBE_ADDRESS
  jffs2: add compr=lzo and compr=zlib options
  jffs2: implement mount option parsing and compression overriding
  mtd: nand: initialize ops.mode
  mtd: provide an alias for the redboot module name
  mtd: m25p80: don't probe device which has status of 'disabled'
  mtd: nand_h1900 never worked
  mtd: Add DiskOnChip G3 support
  mtd: m25p80: add EON flash EN25Q32B into spi flash id table
  mtd: mark block device queue as non-rotational
  mtd: r852: make r852_pm_ops static
  mtd: m25p80: add support for at25df321a spi data flash
  mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
  mtd: nand: switch `check_pattern()' to standard `memcmp()'
  mtd: nand: invalidate cache on unaligned reads
  mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
  mtd: nand: wait to set BBT version
  mtd: nand: scrub BBT on ECC errors
  ...

Fix up trivial conflicts:
 - arch/arm/mach-at91/board-usb-a9260.c
	Merged into board-usb-a926x.c
 - drivers/mtd/maps/lantiq-flash.c
	add_mtd_partitions -> mtd_device_register vs changed to use
	mtd_device_parse_register.
2011-11-07 09:11:16 -08:00
..
mach-a3 mtd: nand: rename NAND_USE_FLASH_BBT 2011-09-11 15:01:56 +03:00
mach-fs mtd: nand: rename NAND_USE_FLASH_BBT 2011-09-11 15:01:56 +03:00
pci
Kconfig MII: fix Kconfig dependencies for MII 2011-09-15 15:49:08 -04:00
Makefile Drop the CRISv32 version of pcf8563 2011-03-21 11:52:11 +01:00
axisflashmap.c mtd: cris: convert to mtd_device_register() 2011-05-25 02:21:07 +01:00
cryptocop.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
i2c.c llseek: automatically add .llseek fop 2010-10-15 15:53:27 +02:00
i2c.h
iop_fw_load.c
sync_serial.c Fix common misspellings 2011-03-31 11:26:23 -03:00