Skip to content
  1. Nov 08, 2011
    • Linus Torvalds's avatar
      Merge git://git.infradead.org/mtd-2.6 · e0d65113
      Linus Torvalds authored
      * git://git.infradead.org/mtd-2.6: (226 commits)
        mtd: tests: annotate as DANGEROUS in Kconfig
        mtd: tests: don't use mtd0 as a default
        mtd: clean up usage of MTD_DOCPROBE_ADDRESS
        jffs2: add compr=lzo and compr=zlib options
        jffs2: implement mount option parsing and compression overriding
        mtd: nand: initialize ops.mode
        mtd: provide an alias for the redboot module name
        mtd: m25p80: don't probe device which has status of 'disabled'
        mtd: nand_h1900 never worked
        mtd: Add DiskOnChip G3 support
        mtd: m25p80: add EON flash EN25Q32B into spi flash id table
        mtd: mark block device queue as non-rotational
        mtd: r852: make r852_pm_ops static
        mtd: m25p80: add support for at25df321a spi data flash
        mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
        mtd: nand: switch `check_pattern()' to standard `memcmp()'
        mtd: nand: invalidate cache on unaligned reads
        mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
        mtd: nand: wait to set BBT version
        mtd: nand: scrub BBT on ECC errors
        ...
      
      Fix up trivial conflicts:
       - arch/arm/mach-at91/board-usb-a9260.c
      	Merged into board-usb-a926x.c
       - drivers/mtd/maps/lantiq-flash.c
      	add_mtd_partitions -> mtd_device_register vs changed to use
      	mtd_device_parse_register.
      e0d65113
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 · cf5e15fb
      Linus Torvalds authored
      * 'linux-next' of git://git.infradead.org/ubifs-2.6:
        UBIFS: fix the dark space calculation
        UBIFS: introduce a helper to dump scanning info
      cf5e15fb
  2. Nov 07, 2011
  3. Nov 06, 2011