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
..
build.c	UBI: fix oops in error path	2011-06-01 11:23:12 +03:00
cdev.c	fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers	2011-07-20 20:47:59 -04:00
debug.c	UBI: switch debugging tests knobs to debugfs	2011-06-01 11:23:12 +03:00
debug.h	UBI: do not link debug messages when debugging is disabled	2011-08-19 19:02:27 +03:00
eba.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
gluebi.c	mtd: convert remaining users to mtd_device_register()	2011-05-25 02:25:00 +01:00
io.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
kapi.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
Kconfig	UBI: do not select KALLSYMS_ALL	2011-04-05 11:08:59 +03:00
Makefile	UBI: make gluebi a separate module	2009-06-03 17:45:23 +03:00
misc.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
scan.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
scan.h	UBI: add slab cache for ubi_scan_leb objects	2011-02-06 19:19:23 +02:00
ubi-media.h	UBI: use __packed instead of __attribute__((packed))	2011-04-14 11:34:41 +03:00
ubi.h	UBI: dump stack when switching to R/O mode	2011-06-01 11:23:13 +03:00
upd.c	UBI: fix memory leak in update path	2010-01-18 18:53:56 +02:00
vmt.c	mtd: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed	2011-10-31 19:31:11 -04:00
vtbl.c	mtd: utilize `mtd_is_*()' functions	2011-09-21 09:19:06 +03:00
wl.c	UBI: prepare debugging stuff to further debugfs conversion	2011-06-01 11:21:52 +03:00