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
..
Kconfig	mtd: drop Integrator flash map Kconfig	14 years ago
Makefile	mtd: maps: drop edb7312 support	14 years ago
amd76xrom.c	…
autcpu12-nvram.c	…
bcm963xx-flash.c	…
bfin-async-flash.c	mtd: bfin-async-flash.c: use mtd_device_parse_register	14 years ago
cdb89712.c	…
cfi_flagadm.c	…
ck804xrom.c	…
dbox2-flash.c	…
dc21285.c	mtd: dc21285.c: use mtd_device_parse_register	14 years ago
dilnetpc.c	…
dmv182.c	…
esb2rom.c	…
fortunet.c	…
gpio-addr-flash.c	mtd: gpio-addr-flash.c: use mtd_device_parse_register	14 years ago
h720x-flash.c	mtd: h720x-flash.c: use mtd_device_parse_register	14 years ago
ichxrom.c	…
impa7.c	mtd: impa7.c: use mtd_device_parse_register	14 years ago
intel_vr_nor.c	mtd: intel_vr_nor.c: use mtd_device_parse_register	14 years ago
ixp4xx.c	mtd: ixp4xx.c: use mtd_device_parse_register	14 years ago
ixp2000.c	mtd: ixp2000.c: use mtd_device_parse_register	14 years ago
l440gx.c	…
lantiq-flash.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
latch-addr-flash.c	mtd: latch-addr-flash.c: use mtd_device_parse_register	14 years ago
map_funcs.c	…
mbx860.c	…
netsc520.c	…
nettel.c	…
octagon-5066.c	…
pci.c	…
pcmciamtd.c	mtd: cleanup last uses of MTD_DEBUG config macros	14 years ago
physmap.c	mtd: physmap.c: use mtd_device_parse_register	14 years ago
physmap_of.c	mtd: physmap_of.c: use mtd_device_parse_register	14 years ago
pismo.c	…
plat-ram.c	mtd: plat-ram.c: use mtd_device_parse_register	14 years ago
pmcmsp-flash.c	…
pxa2xx-flash.c	mtd: pxa2xx-flash.c: use mtd_device_parse_register	14 years ago
rbtx4939-flash.c	mtd: rbtx4939-flash.c: use mtd_device_parse_register	14 years ago
rpxlite.c	…
sa1100-flash.c	mtd: sa1100-flash.c: use mtd_device_parse_register	14 years ago
sbc_gxx.c	…
sc520cdp.c	…
scb2_flash.c	…
scx200_docflash.c	…
solutionengine.c	mtd: solutionengine.c: use mtd_device_parse_register	14 years ago
sun_uflash.c	…
tqm8xxl.c	…
ts5500_flash.c	…
tsunami_flash.c	…
uclinux.c	…
vmax301.c	…
vmu-flash.c	…
wr_sbc82xx_flash.c	mtd: wr_sbc82xx_flash.c: use mtd_device_parse_register	14 years ago