You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		13 years ago
..
chips	mtd: cleanup style on pr_debug messages	14 years ago
devices	mtd: clean up usage of MTD_DOCPROBE_ADDRESS	13 years ago
lpddr	mtd: Add module.h to drivers users that were implicitly using it.	13 years ago
maps	Merge git://git.infradead.org/mtd-2.6	13 years ago
nand	Merge git://git.infradead.org/mtd-2.6	13 years ago
onenand	Merge git://git.infradead.org/mtd-2.6	13 years ago
tests	mtd: tests: don't use mtd0 as a default	13 years ago
ubi	Merge git://git.infradead.org/mtd-2.6	13 years ago
Kconfig	Merge git://git.infradead.org/mtd-2.6	13 years ago
Makefile	mtd: make ofpart buildable as a separate module	14 years ago
afs.c	mtd: abstract last MTD partition parser argument	14 years ago
ar7part.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
cmdlinepart.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
ftl.c	mtd: spelling fixes	14 years ago
inftlcore.c	mtd: utilize `mtd_is_*()' functions	14 years ago
inftlmount.c	mtd: spelling fixes	14 years ago
mtd_blkdevs.c	mtd: mark block device queue as non-rotational	13 years ago
mtdblock.c	mtd: replace DEBUG() with pr_debug()	14 years ago
mtdblock_ro.c	mtd: Add module.h to drivers users that were implicitly using it.	13 years ago
mtdchar.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
mtdconcat.c	mtd: utilize `mtd_is_*()' functions	14 years ago
mtdcore.c	mtd: check parts pointer before using it	14 years ago
mtdcore.h	mtd: hide parse_mtd_partitions	14 years ago
mtdoops.c	mtd: utilize `mtd_is_*()' functions	14 years ago
mtdpart.c	mtd: utilize `mtd_is_*()' functions	14 years ago
mtdsuper.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
mtdswap.c	mtd: utilize `mtd_is_*()' functions	14 years ago
nftlcore.c	mtd: utilize `mtd_is_*()' functions	14 years ago
nftlmount.c	mtd: spelling fixes	14 years ago
ofpart.c	mtd: ofpart: add ofoldpart alias	14 years ago
redboot.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
rfd_ftl.c	mtd: Add module.h to drivers users that were implicitly using it.	13 years ago
sm_ftl.c	mtd: utilize `mtd_is_*()' functions	14 years ago
sm_ftl.h	…
ssfdc.c	mtd: rename MTD_OOB_* to MTD_OPS_*	14 years ago