• Linus Torvalds's avatar
    Merge git://git.infradead.org/mtd-2.6 · 79346507
    Linus Torvalds authored
    * git://git.infradead.org/mtd-2.6: (82 commits)
      mtd: fix build error in m25p80.c
      mtd: Remove redundant mutex from mtd_blkdevs.c
      MTD: Fix wrong check register_blkdev return value
      Revert "mtd: cleanup Kconfig dependencies"
      mtd: cfi_cmdset_0002: make sector erase command variable
      mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips
      mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode
      mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one
      block2mtd: dubious assignment
      P4080/mtd: Fix the freescale lbc issue with 36bit mode
      P4080/eLBC: Make Freescale elbc interrupt common to elbc devices
      mtd: phram: use KBUILD_MODNAME
      mtd: OneNAND: S5PC110: Fix double call suspend & resume function
      mtd: nand: fix MTD_MODE_RAW writes
      jffs2: use kmemdup
      mtd: sm_ftl: cosmetic, use bool when possible
      mtd: r852: remove useless pci powerup/down from suspend/resume routines
      mtd: blktrans: fix a race vs kthread_stop
      mtd: blktrans: kill BKL
      mtd: allow to unload the mtdtrans module if its block devices aren't open
      ...
    
    Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c
    79346507
mtdchar.c 25.8 KB