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
..
bbm.h	mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCT	2011-09-11 15:01:57 +03:00
blktrans.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1	2011-03-25 17:41:20 +02:00
cfi_endian.h
cfi.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
concat.h
doc2000.h
flashchip.h
fsmc.h	mtd: FSMC NAND fix obvious speling errors	2010-12-03 16:35:40 +00:00
ftl.h
gen_probe.h
inftl.h
latch-addr-flash.h	mtd: NOR flash driver for OMAP-L137/AM17x	2011-03-11 14:22:47 +00:00
map.h
mtd.h	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
mtdram.h
nand_bch.h	mtd: nand: add software BCH ECC support	2011-03-11 17:49:08 +00:00
nand_ecc.h
nand-gpio.h
nand.h	mtd: nand: kill member ops' of struct nand_chip'	2011-09-11 15:57:44 +03:00
ndfc.h
nftl.h
onenand_regs.h	OMAP: OneNAND: fix 104MHz support	2011-02-17 15:44:45 -08:00
onenand.h	mtd: OneNAND: Detect the correct NOP when 4KiB pagesize	2011-09-11 15:02:13 +03:00
partitions.h	mtd: remove put_partition_parser() from public header	2011-09-11 15:02:13 +03:00
pfow.h
physmap.h	mtd: drop physmap_configure	2011-09-11 15:01:57 +03:00
pismo.h
plat-ram.h
pmc551.h
qinfo.h
sh_flctl.h
sharpsl.h
super.h
ubi.h	UBI: clarify the volume notification types' doc	2011-06-23 17:40:07 +03:00
xip.h	Fix common misspellings	2011-03-31 11:26:23 -03:00