• Linus Torvalds's avatar
    Merge git://git.infradead.org/mtd-2.6 · e8a89ceb
    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6: (79 commits)
      mtd: Remove obsolete <mtd/compatmac.h> include
      mtd: Update copyright notices
      jffs2: Update copyright notices
      mtd-physmap: add support users can assign the probe type in board files
      mtd: remove redwood map driver
      mxc_nand: Add v3 (i.MX51) Support
      mxc_nand: support 8bit ecc
      mxc_nand: fix correct_data function
      mxc_nand: add V1_V2 namespace to registers
      mxc_nand: factor out a check_int function
      mxc_nand: make some internally used functions overwriteable
      mxc_nand: rework get_dev_status
      mxc_nand: remove 0xe00 offset from registers
      mtd: denali: Add multi connected NAND support
      mtd: denali: Remove set_ecc_config function
      mtd: denali: Remove unuseful code in get_xx_nand_para functions
      mtd: denali: Remove device_info_tag structure
      mtd: m25p80: add support for the Winbond W25Q32 SPI flash chip
      mtd: m25p80: add support for the Intel/Numonyx {16,32,64}0S33B SPI flash chips
      mtd: m25p80: add support for the EON EN25P{32, 64} SPI flash chips
    Fix up trivial conflicts in drivers/mtd/maps/{Kconfig,redwood.c} due to
    redwood driver removal.
jffs2.h 6.85 KB