• Linus Torvalds's avatar
    Merge git://git.infradead.org/mtd-2.6 · ab2020f2
    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6: (59 commits)
      mtd: mtdpart: disallow reading OOB past the end of the partition
      mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe
      UBI: use mtd->writebufsize to set minimal I/O unit size
      mtd: initialize writebufsize in the MTD object of a partition
      mtd: onenand: add mtd->writebufsize initialization
      mtd: nand: add mtd->writebufsize initialization
      mtd: cfi: add writebufsize initialization
      mtd: add writebufsize field to mtd_info struct
      mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use
      mtd: OneNAND: add enable / disable methods to onenand_chip
      mtd: m25p80: Fix JEDEC ID for AT26DF321
      mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max)
      mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
      mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
      mtd: nand: ams-delta: drop omap_read/write, use ioremap
      mtd: m25p80: add debugging trace in sst_write
      mtd: nand: ams-delta: select for built-in by default
      mtd: OneNAND: lighten scary initial bad block messages
      mtd: OneNAND: OMAP2/3: add support for command line partitioning
      mtd: nand: rearrange ONFI revision checking, add ONFI 2.3
    Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW.
mtdoops.c 12.2 KB