Skip to content
  • Linus Torvalds's avatar
    Merge git://git.infradead.org/mtd-2.6 · ba7cc09c
    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6: (21 commits)
      [MTD] [CHIPS] Remove MTD_OBSOLETE_CHIPS (jedec, amd_flash, sharp)
      [MTD] Delete allegedly obsolete "bank_size" field of mtd_info.
      [MTD] Remove unnecessary user space check from mtd.h.
      [MTD] [MAPS] Remove flash maps for no longer supported 405LP boards
      [MTD] [MAPS] Fix missing printk() parameter in physmap_of.c MTD driver
      [MTD] [NAND] platform NAND driver: add driver
      [MTD] [NAND] platform NAND driver: update header
      [JFFS2] Simplify and clean up jffs2_add_tn_to_tree() some more.
      [JFFS2] Remove another bogus optimisation in jffs2_add_tn_to_tree()
      [JFFS2] Remove broken insert_point optimisation in jffs2_add_tn_to_tree()
      [JFFS2] Remember to calculate overlap on nodes which replace older nodes
      [JFFS2] Don't advance c->wbuf_ofs to next eraseblock after wbuf flush
      [MTD] [NAND] at91_nand.c: CMDLINE_PARTS support
      [MTD] [NAND] Tidy up handling of page number in nand_block_bad()
      [MTD] block2mtd_paramline[] mustn't be __initdata
      [MTD] [NAND] Support multiple chips in CAFÉ driver
      [MTD] [NAND] Rename cafe.c to cafe_nand.c and remove the multi-obj magic
      [MTD] [NAND] Use rslib for CAFÉ ECC
      [RSLIB] Support non-canonical GF representations
      [JFFS2] Remove dead file histo_mips.h
      ...
    ba7cc09c