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
..
gpmi-nand	mtd: rename MTD_OOB_* to MTD_OPS_*	14 years ago
Kconfig	Merge git://git.infradead.org/mtd-2.6	13 years ago
Makefile	mtd: add GPMI-NAND driver in the config and Makefile	14 years ago
alauda.c	mtd: convert remaining users to mtd_device_register()	14 years ago
ams-delta.c	ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h	14 years ago
atmel_nand.c	mtd: atmel_nand: optimize read/write buffer functions	14 years ago
atmel_nand_ecc.h	…
au1550nd.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
autcpu12.c	mtd: nand: rename NAND_USE_FLASH_BBT	14 years ago
bcm_umi_bch.c	…
bcm_umi_nand.c	mtd: bcm_umi_nand: clean up error handling code	14 years ago
bf5xx_nand.c	mtd: bf5xx_nand: convert to mtd_device_register()	14 years ago
cafe_nand.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
cmx270_nand.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
cs553x_nand.c	mtd: cs553x_nand.c: use mtd_device_parse_register	14 years ago
davinci_nand.c	mtd: davinci_nand.c: use mtd_device_parse_register	14 years ago
denali.c	mtd: denali: detect the number of banks before resetting NAND	14 years ago
denali.h	mtd: denali: detect the number of banks	14 years ago
diskonchip.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
fsl_elbc_nand.c	mtd: eLBC NAND: update ecc_stats.corrected when lteccr available	14 years ago
fsl_upm.c	mtd: fsl_upm: fix a memory leak in fun_chip_init error path	14 years ago
fsmc_nand.c	mtd: fsmc_nand.c: use mtd_device_parse_register	14 years ago
gpio.c	mtd: convert remaining users to mtd_device_register()	14 years ago
h1910.c	mtd: h1910.c: use mtd_device_parse_register	14 years ago
jz4740_nand.c	mtd: jz4740_nand.c: use mtd_device_parse_register	14 years ago
mpc5121_nfc.c	mtd: mpc5121_nfc.c: use mtd_device_parse_register	14 years ago
mxc_nand.c	mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks	14 years ago
nand_base.c	mtd: nand: initialize ops.mode	14 years ago
nand_bbt.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
nand_bch.c	mtd: cleanup style on pr_debug messages	14 years ago
nand_bcm_umi.c	…
nand_bcm_umi.h	…
nand_ecc.c	mtd: spelling, capitalization, uniformity	14 years ago
nand_ids.c	…
nandsim.c	mtd: nand: rename NAND_USE_FLASH_BBT	14 years ago
ndfc.c	mtd: ndfc.c: use mtd_device_parse_register	14 years ago
nomadik_nand.c	mtd: nomadik_nand: add missing nand_release in nomadik_nand_remove	14 years ago
nuc900_nand.c	mtd: nuc900_nand: add missing nand_release in nuc900_nand_remove	14 years ago
omap2.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
orion_nand.c	mtd: orion_nand.c: use mtd_device_parse_register	14 years ago
pasemi_nand.c	mtd: nand: rename NAND_USE_FLASH_BBT	14 years ago
plat_nand.c	mtd: plat_nand.c: use mtd_device_parse_register	14 years ago
ppchameleonevb.c	mtd: ppchameleonevb.c: use mtd_device_parse_register	14 years ago
pxa3xx_nand.c	mtd: pxa3xx_nand: enable multiple chip select support	14 years ago
r852.c	mtd: r852: make r852_pm_ops static	14 years ago
r852.h	mtd: r852: remove useless pci powerup/down from suspend/resume routines	14 years ago
rtc_from4.c	mtd: replace DEBUG() with pr_debug()	14 years ago
s3c2410.c	mtd: s3c2410 nand: Remove uncessary null check	14 years ago
sh_flctl.c	mtd: convert remaining users to mtd_device_register()	14 years ago
sharpsl.c	mtd: sharpsl.c: use mtd_device_parse_register	14 years ago
sm_common.c	Merge git://git.infradead.org/mtd-2.6	13 years ago
sm_common.h	…
socrates_nand.c	mtd: socrates_nand.c: use mtd_device_parse_register	14 years ago
spia.c	mtd: convert remaining users to mtd_device_register()	14 years ago
tmio_nand.c	mtd: tmio_nand.c: use mtd_device_parse_register	14 years ago
txx9ndfmc.c	mtd: txx9ndfmc.c: use mtd_device_parse_register	14 years ago