Files
rockchip-kernel/include/linux
Linus Torvalds 05ec7dd8dd Merge git://git.infradead.org/mtd-2.6
* git://git.infradead.org/mtd-2.6: (154 commits)
  mtd: cfi_cmdset_0002: use AMD standard command-set with Winbond flash chips
  mtd: cfi_cmdset_0002: Fix MODULE_ALIAS and linkage for new 0701 commandset ID
  mtd: mxc_nand: Remove duplicate NAND_CMD_RESET case value
  mtd: update gfp/slab.h includes
  jffs2: Stop triggering block erases from jffs2_write_super()
  jffs2: Rename jffs2_erase_pending_trigger() to jffs2_dirty_trigger()
  jffs2: Use jffs2_garbage_collect_trigger() to trigger pending erases
  jffs2: Require jffs2_garbage_collect_trigger() to be called with lock held
  jffs2: Wake GC thread when there are blocks to be erased
  jffs2: Erase pending blocks in GC pass, avoid invalid -EIO return
  jffs2: Add 'work_done' return value from jffs2_erase_pending_blocks()
  mtd: mtdchar: Do not corrupt backing device of device node inode
  mtd/maps/pcmciamtd: Fix printk format for ssize_t in debug messages
  drivers/mtd: Use kmemdup
  mtd: cfi_cmdset_0002: Fix argument order in bootloc warning
  mtd: nand: add Toshiba TC58NVG0 device ID
  pcmciamtd: add another ID
  pcmciamtd: coding style cleanups
  pcmciamtd: fixing obvious errors
  mtd: chips: add SST39WF160x NOR-flashes
  ...

Trivial conflicts due to dev_node removal in drivers/mtd/maps/pcmciamtd.c
2010-05-21 07:25:43 -07:00
..
2010-05-17 22:39:48 -07:00
2010-05-03 08:33:00 -04:00
2010-04-23 14:43:45 -04:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2010-03-12 15:53:10 -08:00
2010-05-14 17:08:01 -04:00
2009-12-16 07:20:13 -08:00
2010-05-19 13:38:54 -04:00
2010-04-25 08:54:42 +02:00
2009-11-20 20:13:39 +01:00
2009-11-20 20:13:39 +01:00
2009-11-20 20:13:39 +01:00
2010-03-12 15:52:32 -08:00
2010-02-05 07:35:05 -08:00
2010-05-10 16:08:01 -07:00
2009-12-10 23:52:01 +00:00
2009-11-04 09:50:58 -08:00
2009-10-01 21:17:49 +02:00
2009-12-15 08:53:33 -08:00
2009-11-04 09:50:58 -08:00
2009-12-23 13:33:54 +01:00
2009-11-04 09:50:58 -08:00
2010-03-16 08:55:32 +01:00
2010-02-09 11:13:56 +01:00
2010-03-07 22:17:09 +01:00
2010-03-02 12:23:42 +01:00
2010-04-01 01:31:13 -07:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2010-02-02 07:32:29 -08:00
2010-01-11 16:28:01 -08:00
2010-05-03 11:50:57 +02:00
2010-03-12 15:52:36 -08:00
2009-11-04 09:50:58 -08:00
2010-03-12 15:52:40 -08:00
2009-09-26 10:17:19 -07:00
2010-05-11 14:40:55 +02:00
2010-05-03 11:50:57 +02:00
2010-04-23 02:08:44 +02:00
2010-03-12 15:53:10 -08:00
2009-12-16 06:56:12 -08:00
2010-05-14 15:09:32 -04:00
2010-04-03 14:56:05 -07:00
2009-12-15 08:53:36 -08:00
2009-12-26 20:40:34 -08:00
2010-02-03 17:39:50 +11:00
2010-03-12 15:53:10 -08:00
2010-02-09 11:13:56 +01:00
2010-02-19 03:35:12 -05:00
2010-03-12 15:52:38 -08:00
2009-09-22 07:17:35 -07:00
2009-12-15 08:53:20 -08:00
2010-03-12 15:52:28 -08:00
2010-04-08 13:37:18 +02:00
2009-12-12 13:08:15 +01:00
2010-05-11 14:40:55 +02:00
2010-04-13 14:49:34 -07:00
2010-02-10 23:49:08 +09:00
2009-11-04 09:50:58 -08:00
2010-02-14 07:13:47 -07:00
2010-04-02 14:30:39 -07:00
2009-11-04 09:50:58 -08:00
2009-11-04 09:50:58 -08:00
2010-05-10 23:08:19 +02:00
2010-03-12 15:53:11 -08:00
2009-12-03 11:43:23 +00:00
2009-12-02 09:55:33 +01:00
2009-09-23 07:39:41 -07:00
2010-03-05 00:20:31 +01:00
2010-02-10 17:47:17 -08:00
2010-05-03 15:53:54 -07:00
2009-10-30 15:06:37 -07:00
2010-03-12 15:52:44 -08:00
2010-03-02 14:28:49 -05:00
2009-11-04 09:50:58 -08:00
2010-05-11 10:09:47 +02:00
2010-03-12 15:53:10 -08:00
2010-05-06 10:56:07 +10:00
2010-03-12 15:52:43 -08:00
2009-11-30 12:02:53 +09:00
2010-03-12 15:52:44 -08:00
2010-05-17 17:18:50 -07:00
2010-04-03 15:09:04 -07:00
2009-12-16 22:32:29 -05:00
2010-05-10 11:08:35 -07:00
2010-01-14 22:38:09 -05:00
2010-03-12 15:52:36 -08:00
2010-05-15 23:28:39 -07:00
2010-02-18 15:43:09 -08:00
2010-04-13 12:43:42 +02:00
2010-03-23 17:19:38 +01:00
2010-05-12 23:02:23 -07:00
2009-10-29 11:17:40 +11:00
2009-11-10 20:54:38 -08:00
2009-09-23 18:13:10 -07:00
2009-09-23 22:26:32 +09:30
2010-01-05 09:17:33 +09:00
2010-03-12 10:03:42 +01:00
2009-12-16 12:16:49 -05:00