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-02-27 12:53:30 +01:00
2009-09-17 20:07:42 +02:00
2010-10-27 18:03:17 -07:00
2010-02-27 12:53:14 +01:00
2009-07-03 15:45:26 +01:00
2008-12-12 18:12:23 +00:00
2010-02-27 12:53:42 +01:00
2010-08-05 13:26:29 +01:00
2009-12-05 09:10:12 -08:00
2010-02-27 12:53:27 +01:00
2009-07-03 15:45:29 +01:00
2010-08-05 13:26:06 +01:00
2009-06-07 05:01:00 -07:00
2009-12-17 01:57:32 +00:00
2010-10-26 16:52:08 -07:00
2010-02-27 12:53:12 +01:00
2009-06-17 11:06:28 +01:00
2010-08-10 13:47:39 -07:00
2010-10-21 11:10:10 -06:00
2010-10-07 14:08:55 +01:00
2010-08-05 13:26:29 +01:00
2010-08-05 13:26:29 +01:00
2010-06-09 11:12:36 +02:00
2008-10-20 08:52:41 -07:00
2010-04-12 17:26:14 +01:00
2010-04-12 17:26:14 +01:00
2010-02-27 12:53:14 +01:00
2010-02-27 12:53:14 +01:00
2010-10-04 18:33:55 +01:00
2010-02-27 12:53:27 +01:00
2010-10-26 16:52:08 -07:00
2009-07-03 15:45:27 +01:00
2010-02-27 12:53:27 +01:00
2009-11-02 12:00:01 +01:00
2010-02-27 12:53:14 +01:00
2010-02-27 12:53:42 +01:00
2010-02-27 12:53:42 +01:00
2010-08-09 16:48:44 -04:00
2009-06-17 11:06:31 +01:00
2010-02-27 12:53:27 +01:00
2010-04-12 17:26:14 +01:00