Commit ac1b7c378ef26fba6694d5f118fe7fc16fee2fe2
Exists in
master
and in
39 other branches
Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (63 commits) mtd: OneNAND: Allow setting of boundary information when built as module jffs2: leaking jffs2_summary in function jffs2_scan_medium mtd: nand: Fix memory leak on txx9ndfmc probe failure. mtd: orion_nand: use burst reads with double word accesses mtd/nand: s3c6400 support for s3c2410 driver [MTD] [NAND] S3C2410: Use DIV_ROUND_UP [MTD] [NAND] S3C2410: Deal with unaligned lengths in S3C2440 buffer read/write [MTD] [NAND] S3C2410: Allow the machine code to get the BBT table from NAND [MTD] [NAND] S3C2410: Added a kerneldoc for s3c2410_nand_set mtd: physmap_of: Add multiple regions and concatenation support mtd: nand: max_retries off by one in mxc_nand mtd: nand: s3c2410_nand_setrate(): use correct macros for 2412/2440 mtd: onenand: add bbt_wait & unlock_all as replaceable for some platform mtd: Flex-OneNAND support mtd: nand: add OMAP2/OMAP3 NAND driver mtd: maps: Blackfin async: fix memory leaks in probe/remove funcs mtd: uclinux: mark local stuff static mtd: uclinux: do not allow to be built as a module mtd: uclinux: allow systems to override map addr/size mtd: blackfin NFC: fix hang when using NAND on BF527-EZKITs ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 49 changed files Side-by-side Diff
- Documentation/ABI/testing/sysfs-class-mtd
- Documentation/kernel-parameters.txt
- MAINTAINERS
- arch/arm/mach-davinci/include/mach/nand.h
- arch/arm/plat-s3c/include/plat/nand.h
- drivers/mtd/chips/cfi_cmdset_0001.c
- drivers/mtd/chips/jedec_probe.c
- drivers/mtd/devices/m25p80.c
- drivers/mtd/maps/Kconfig
- drivers/mtd/maps/Makefile
- drivers/mtd/maps/bfin-async-flash.c
- drivers/mtd/maps/integrator-flash.c
- drivers/mtd/maps/physmap.c
- drivers/mtd/maps/physmap_of.c
- drivers/mtd/maps/pmcmsp-ramroot.c
- drivers/mtd/maps/pxa2xx-flash.c
- drivers/mtd/maps/rbtx4939-flash.c
- drivers/mtd/maps/sa1100-flash.c
- drivers/mtd/maps/uclinux.c
- drivers/mtd/mtd_blkdevs.c
- drivers/mtd/mtdchar.c
- drivers/mtd/mtdcore.c
- drivers/mtd/mtdpart.c
- drivers/mtd/nand/Kconfig
- drivers/mtd/nand/Makefile
- drivers/mtd/nand/atmel_nand.c
- drivers/mtd/nand/bf5xx_nand.c
- drivers/mtd/nand/davinci_nand.c
- drivers/mtd/nand/mxc_nand.c
- drivers/mtd/nand/nand_base.c
- drivers/mtd/nand/nand_ecc.c
- drivers/mtd/nand/omap2.c
- drivers/mtd/nand/orion_nand.c
- drivers/mtd/nand/plat_nand.c
- drivers/mtd/nand/s3c2410.c
- drivers/mtd/nand/txx9ndfmc.c
- drivers/mtd/onenand/omap2.c
- drivers/mtd/onenand/onenand_base.c
- drivers/mtd/onenand/onenand_bbt.c
- drivers/mtd/onenand/onenand_sim.c
- fs/compat_ioctl.c
- fs/jffs2/scan.c
- include/linux/mtd/nand.h
- include/linux/mtd/onenand.h
- include/linux/mtd/onenand_regs.h
- include/linux/mtd/partitions.h
- include/mtd/Kbuild
- include/mtd/jffs2-user.h
- include/mtd/mtd-abi.h