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
..
gpmi-nand	mtd: rename MTD_OOB_* to MTD_OPS_*	2011-09-11 15:28:59 +03:00
alauda.c
ams-delta.c
atmel_nand_ecc.h
atmel_nand.c	mtd: atmel_nand: optimize read/write buffer functions	2011-09-11 15:02:15 +03:00
au1550nd.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
autcpu12.c
bcm_umi_bch.c
bcm_umi_nand.c	mtd: bcm_umi_nand: clean up error handling code	2011-09-11 15:02:17 +03:00
bf5xx_nand.c
cafe_nand.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
cmx270_nand.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
cs553x_nand.c
davinci_nand.c
denali.c
denali.h
diskonchip.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
fsl_elbc_nand.c	mtd: eLBC NAND: update ecc_stats.corrected when lteccr available	2011-09-11 15:02:17 +03:00
fsl_upm.c	mtd: fsl_upm: fix a memory leak in fun_chip_init error path	2011-09-11 15:02:14 +03:00
fsmc_nand.c
gpio.c
h1910.c
jz4740_nand.c
Kconfig	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
Makefile	mtd: add GPMI-NAND driver in the config and Makefile	2011-09-11 15:02:18 +03:00
mpc5121_nfc.c	mtd: mpc5121_nfc.c: use mtd_device_parse_register	2011-09-11 15:02:12 +03:00
mxc_nand.c	mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks	2011-09-23 15:25:35 +03:00
nand_base.c	mtd: nand: initialize ops.mode	2011-10-16 15:04:00 +03:00
nand_bbt.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
nand_bch.c	mtd: cleanup style on pr_debug messages	2011-09-11 15:02:16 +03:00
nand_bcm_umi.c
nand_bcm_umi.h
nand_ecc.c	mtd: spelling, capitalization, uniformity	2011-09-11 15:02:13 +03:00
nand_ids.c
nandsim.c
ndfc.c	mtd: ndfc.c: use mtd_device_parse_register	2011-09-11 15:02:12 +03:00
nomadik_nand.c
nuc900_nand.c
omap2.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
orion_nand.c
pasemi_nand.c
plat_nand.c
ppchameleonevb.c
pxa3xx_nand.c	mtd: pxa3xx_nand: enable multiple chip select support	2011-09-11 15:02:15 +03:00
r852.c	mtd: r852: make r852_pm_ops static	2011-10-01 14:40:56 +03:00
r852.h
rtc_from4.c	mtd: replace DEBUG() with pr_debug()	2011-09-11 15:02:16 +03:00
s3c2410.c	mtd: s3c2410 nand: Remove uncessary null check	2011-09-11 15:02:17 +03:00
sh_flctl.c
sharpsl.c
sm_common.c	Merge git://git.infradead.org/mtd-2.6	2011-11-07 09:11:16 -08:00
sm_common.h
socrates_nand.c	mtd: socrates_nand.c: use mtd_device_parse_register	2011-09-11 15:02:13 +03:00
spia.c
tmio_nand.c
txx9ndfmc.c