Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6
MTD pull for 3.3 * tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits) mtd: Fix dependency for MTD_DOC200x mtd: do not use mtd->block_markbad directly logfs: do not use 'mtd->block_isbad' directly mtd: introduce mtd_can_have_bb helper mtd: do not use mtd->suspend and mtd->resume directly mtd: do not use mtd->lock, unlock and is_locked directly mtd: do not use mtd->sync directly mtd: harmonize mtd_writev usage mtd: do not use mtd->lock_user_prot_reg directly mtd: mtd->write_user_prot_reg directly mtd: do not use mtd->read_*_prot_reg directly mtd: do not use mtd->get_*_prot_info directly mtd: do not use mtd->read_oob directly mtd: mtdoops: do not use mtd->panic_write directly romfs: do not use mtd->get_unmapped_area directly mtd: do not use mtd->get_unmapped_area directly mtd: do use mtd->point directly mtd: introduce mtd_has_oob helper mtd: mtdcore: export symbols cleanup mtd: clean-up the default_mtd_writev function ... Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c
No related branches found
No related tags found
Showing
- Documentation/ABI/testing/sysfs-devices-platform-docg3 34 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-platform-docg3
- Documentation/devicetree/bindings/mtd/gpio-control-nand.txt 44 additions, 0 deletionsDocumentation/devicetree/bindings/mtd/gpio-control-nand.txt
- arch/arm/mach-davinci/board-da850-evm.c 1 addition, 1 deletionarch/arm/mach-davinci/board-da850-evm.c
- arch/cris/arch-v32/drivers/axisflashmap.c 3 additions, 4 deletionsarch/cris/arch-v32/drivers/axisflashmap.c
- arch/mips/bcm63xx/boards/board_bcm963xx.c 3 additions, 0 deletionsarch/mips/bcm63xx/boards/board_bcm963xx.c
- arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h 5 additions, 6 deletionsarch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h
- drivers/mtd/Kconfig 8 additions, 0 deletionsdrivers/mtd/Kconfig
- drivers/mtd/Makefile 1 addition, 0 deletionsdrivers/mtd/Makefile
- drivers/mtd/afs.c 2 additions, 2 deletionsdrivers/mtd/afs.c
- drivers/mtd/ar7part.c 7 additions, 8 deletionsdrivers/mtd/ar7part.c
- drivers/mtd/bcm63xxpart.c 222 additions, 0 deletionsdrivers/mtd/bcm63xxpart.c
- drivers/mtd/chips/cfi_cmdset_0020.c 8 additions, 5 deletionsdrivers/mtd/chips/cfi_cmdset_0020.c
- drivers/mtd/devices/Kconfig 12 additions, 0 deletionsdrivers/mtd/devices/Kconfig
- drivers/mtd/devices/block2mtd.c 1 addition, 1 deletiondrivers/mtd/devices/block2mtd.c
- drivers/mtd/devices/doc2000.c 0 additions, 9 deletionsdrivers/mtd/devices/doc2000.c
- drivers/mtd/devices/doc2001.c 0 additions, 8 deletionsdrivers/mtd/devices/doc2001.c
- drivers/mtd/devices/doc2001plus.c 0 additions, 9 deletionsdrivers/mtd/devices/doc2001plus.c
- drivers/mtd/devices/docg3.c 1241 additions, 230 deletionsdrivers/mtd/devices/docg3.c
- drivers/mtd/devices/docg3.h 61 additions, 4 deletionsdrivers/mtd/devices/docg3.h
- drivers/mtd/devices/docprobe.c 1 addition, 6 deletionsdrivers/mtd/devices/docprobe.c
Loading
Please register or sign in to comment