Linus Torvalds 79346507ad Merge git://git.infradead.org/mtd-2.6
* 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
2010-10-30 08:31:35 -07:00
..
2010-08-04 10:26:03 +10:00
2009-12-10 20:08:15 -06:00
2010-10-26 16:52:08 -07:00
2010-10-07 14:08:55 +01:00
2010-08-10 13:47:39 -07:00
2010-10-07 14:08:55 +01:00
2010-08-14 22:26:51 +02:00
2010-05-17 12:18:23 +03:00
2010-05-17 12:18:21 +03:00
2010-03-01 12:36:06 -03:00
2010-06-09 11:12:36 +02:00
2010-05-05 09:11:10 -04:00
2009-10-30 17:21:28 +11:00
2010-03-05 03:04:08 -06:00
2010-10-26 16:52:08 -07:00
2010-10-26 16:52:08 -07:00
2009-04-07 15:18:58 +10:00
2009-12-09 17:10:37 +11:00
2010-03-05 03:04:08 -06:00
2010-08-24 15:26:30 +10:00
2010-08-24 14:41:48 +10:00
2010-06-28 12:41:33 -07:00
2009-04-01 08:59:16 -07:00
2009-08-28 14:24:10 +10:00