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
..
bbm.h	mtd: nand: improve comment on NAND_BBT_DYNAMIC_STRUCT	14 years ago
blktrans.h	…
cfi.h	Fix common misspellings	14 years ago
cfi_endian.h	…
concat.h	…
doc2000.h	…
flashchip.h	…
fsmc.h	…
ftl.h	…
gen_probe.h	…
inftl.h	…
latch-addr-flash.h	…
map.h	…
mtd.h	Merge git://git.infradead.org/mtd-2.6	13 years ago
mtdram.h	…
nand-gpio.h	…
nand.h	mtd: nand: kill member `ops' of `struct nand_chip'	14 years ago
nand_bch.h	…
nand_ecc.h	…
ndfc.h	…
nftl.h	…
onenand.h	mtd: OneNAND: Detect the correct NOP when 4KiB pagesize	14 years ago
onenand_regs.h	…
partitions.h	mtd: remove put_partition_parser() from public header	14 years ago
pfow.h	…
physmap.h	mtd: drop physmap_configure	14 years ago
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	14 years ago
xip.h	Fix common misspellings	14 years ago