Linus Torvalds 623ff7739e
Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6 ...
Pull MTD changes from David Woodhouse:
- Artem's cleanup of the MTD API continues apace.
- Fixes and improvements for ST FSMC and SuperH FLCTL NAND, amongst
others.
- More work on DiskOnChip G3, new driver for DiskOnChip G4.
- Clean up debug/warning printks in JFFS2 to use pr_<level>.
Fix up various trivial conflicts, largely due to changes in calling
conventions for things like dmaengine_prep_slave_sg() (new inline
wrapper to hide new parameter, clashing with rewrite of previously last
parameter that used to be an 'append' flag, and is now a bitmap of
'unsigned long flags').
(Also some header file fallout - like so many merges this merge window -
and silly conflicts with sparse fixes)
* tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6: (120 commits)
mtd: docg3 add protection against concurrency
mtd: docg3 refactor cascade floors structure
mtd: docg3 increase write/erase timeout
mtd: docg3 fix inbound calculations
mtd: nand: gpmi: fix function annotations
mtd: phram: fix section mismatch for phram_setup
mtd: unify initialization of erase_info->fail_addr
mtd: support ONFI multi lun NAND
mtd: sm_ftl: fix typo in major number.
mtd: add device-tree support to spear_smi
mtd: spear_smi: Remove default partition information from driver
mtd: Add device-tree support to fsmc_nand
mtd: fix section mismatch for doc_probe_device
mtd: nand/fsmc: Remove sparse warnings and errors
mtd: nand/fsmc: Add DMA support
mtd: nand/fsmc: Access the NAND device word by word whenever possible
mtd: nand/fsmc: Use dev_err to report error scenario
mtd: nand/fsmc: Use devm routines
mtd: nand/fsmc: Modify fsmc driver to accept nand timing parameters via platform
mtd: fsmc_nand: add pm callbacks to support hibernation
...
2012-03-30 17:31:56 -07:00
2012-03-29 15:34:57 -07:00
2012-03-06 15:16:18 -05:00
2012-02-03 01:21:25 +01:00
2012-03-28 10:01:29 -07:00
2012-03-27 00:37:23 +01:00
2012-03-28 13:56:35 -07:00
2012-03-17 12:20:44 -07:00
2012-02-15 00:19:48 -05:00
2012-03-30 16:09:02 -07:00
2012-03-24 10:41:37 -07:00
2012-03-28 20:59:45 -07:00
2012-03-30 17:31:56 -07:00
2012-03-07 17:41:28 +01:00
2012-02-21 13:29:06 +01:00
2012-03-07 17:40:56 +01:00
2012-03-07 17:40:49 +01:00
2012-03-26 11:49:47 -04:00
2012-03-12 22:49:02 +01:00
2012-03-30 16:45:39 -07:00
2012-03-26 20:41:01 +04:00
2012-03-13 11:21:23 +11:00
2012-03-28 13:56:35 -07:00
2012-03-28 12:34:33 -07:00
2012-03-24 10:08:39 -07:00
2012-03-26 11:48:54 -04:00
2012-03-15 12:42:07 -07:00
2012-03-16 10:38:24 -04:00
2012-03-30 16:45:39 -07:00
2012-02-20 12:48:48 -08:00
2012-02-09 09:04:23 -08:00
2012-03-01 16:14:48 +01:00
2012-03-22 09:31:55 -04:00
2012-03-24 10:41:37 -07:00
2012-03-01 13:38:49 +01:00
2012-03-07 17:06:08 +11:00
2012-03-16 10:38:24 -04:00
2012-03-20 21:29:40 -04:00
2012-03-20 21:29:46 -04:00
2012-03-24 10:08:39 -07:00
2012-03-04 17:54:34 -05:00
2012-03-23 16:58:34 -07:00
2012-02-07 07:51:30 +01:00
2012-03-04 17:54:35 -05:00
2012-03-16 10:38:24 -04:00
2012-03-24 10:41:37 -07:00
2012-03-21 17:55:01 -07:00
2012-03-16 20:35:02 +00:00
2012-03-16 20:35:02 +00:00
2012-03-16 20:35:01 +00:00
2012-02-01 18:37:39 -08:00
2012-03-28 18:30:03 +01:00
2012-03-21 17:54:56 -07:00
2012-03-29 18:12:23 -07:00
2012-03-23 16:58:36 -07:00
2012-02-28 16:02:54 +01:00
2012-02-02 15:30:47 -08:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:41:37 -07:00
2012-03-30 03:23:30 -04:00
2012-03-28 17:14:35 -07:00
2012-03-29 14:46:05 -07:00
2012-03-16 10:38:24 -04:00
2012-03-23 16:58:38 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:37 -04:00
2012-03-03 09:02:52 -07:00
2012-03-28 15:58:21 -07:00
2012-03-20 21:29:53 -04:00
2012-03-17 21:51:34 +01:00
2012-03-21 18:55:10 -07:00
2012-02-20 19:46:36 +11:00
2012-03-28 15:02:41 -07:00
2012-03-25 14:35:58 -05:00
2012-03-29 15:34:57 -07:00
2012-02-22 18:15:39 +05:30
2012-03-28 14:24:40 -07:00
2012-03-28 18:30:03 +01:00
2012-02-08 09:19:42 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:53:13 -08:00
2012-02-13 00:46:41 -05:00
2012-03-01 16:41:26 -05:00
2012-03-04 17:54:34 -05:00
2006-03-31 12:18:54 -08:00
2012-03-24 10:41:37 -07:00
2012-02-19 10:30:57 -08:00
2012-03-20 21:29:32 -04:00
2012-03-18 22:15:39 +01:00
2012-03-24 10:41:37 -07:00
2012-03-29 14:53:25 -07:00
2012-03-04 17:54:34 -05:00
2012-02-21 11:08:29 -05:00
2012-02-21 11:08:30 -05:00
2012-03-02 10:38:33 +01:00
2012-02-28 17:10:21 +00:00
2012-03-19 17:56:18 -07:00
2012-03-28 14:08:46 -07:00
2012-03-24 10:08:39 -07:00
2012-03-21 17:55:02 -07:00
2012-03-21 17:54:59 -07:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-16 13:36:04 -07:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-26 21:47:19 +02:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-02-21 16:56:45 -05:00
2012-03-04 20:41:38 -05:00
2012-03-24 10:08:39 -07:00
2012-02-24 01:37:35 -08:00
2012-02-08 15:52:45 -05:00
2012-02-08 15:52:45 -05:00
2012-03-16 23:00:20 -07:00
2012-03-21 17:54:59 -07:00
2012-03-09 10:56:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-04 17:54:34 -05:00
2012-02-15 09:45:53 +01:00
2012-02-14 08:44:55 -08:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-02-13 00:46:41 -05:00
2012-02-26 16:48:06 -07:00
2012-03-04 20:41:38 -05:00
2012-02-14 13:45:56 -02:00
2012-03-13 22:45:38 -04:00
2012-03-13 22:45:25 -04:00
2012-02-28 20:01:08 +01:00
2012-03-16 10:38:24 -04:00
2012-03-08 10:50:35 -08:00
2012-03-29 18:12:23 -07:00
2012-03-21 17:54:57 -07:00
2012-03-29 18:12:23 -07:00
2012-03-23 08:53:47 -07:00
2012-03-08 10:50:35 -08:00
2012-03-23 16:58:41 -07:00
2012-03-05 15:49:42 -08:00
2012-03-04 17:54:34 -05:00
2012-03-28 14:35:31 -07:00
2012-03-08 14:11:36 +02:00
2012-03-23 16:58:35 -07:00
2012-03-23 16:58:34 -07:00
2012-02-29 15:35:41 -06:00
2012-03-28 18:30:03 +01:00
2012-03-23 16:58:33 -07:00
2012-03-26 20:40:59 +04:00
2012-03-28 18:30:03 +01:00
2012-03-23 16:58:31 -07:00
2012-03-16 10:38:24 -04:00
2012-03-15 21:41:34 +01:00
2012-03-03 15:04:45 -05:00
2012-03-21 17:55:02 -07:00
2012-03-04 17:54:34 -05:00
2012-03-21 17:54:57 -07:00
2012-03-28 17:19:28 -07:00
2012-03-21 17:54:56 -07:00
2012-03-27 16:30:09 -07:00
2012-03-26 12:50:52 +10:30
2012-03-26 12:50:51 +10:30
2012-02-02 00:23:14 +11:00
2012-02-21 15:03:48 -05:00
2012-02-24 01:42:07 -08:00
2012-03-24 10:41:37 -07:00
2012-02-24 10:05:59 +01:00
2012-02-26 14:10:44 -05:00
2012-03-06 15:16:19 -05:00
2012-03-26 11:48:54 -04:00
2012-01-31 18:20:28 -05:00
2012-03-02 17:18:10 -05:00
2012-03-21 09:31:44 -04:00
2012-03-05 15:26:47 -05:00
2012-02-16 14:55:27 -05:00
2012-03-17 11:09:33 -04:00
2012-03-21 09:31:46 -04:00
2012-01-31 18:20:25 -05:00
2012-03-04 17:54:34 -05:00
2012-03-12 14:19:34 -04:00
2012-03-23 16:58:31 -07:00
2012-02-16 06:11:23 -07:00
2012-03-24 10:41:37 -07:00
2012-02-05 23:08:30 -07:00
2012-02-26 16:48:06 -07:00
2012-03-15 23:28:19 +08:00
2012-03-05 08:09:09 -07:00
2012-03-28 14:41:36 -07:00
2012-02-23 09:39:23 +02:00
2012-03-21 17:54:58 -07:00
2012-03-16 10:38:24 -04:00
2012-03-14 17:25:56 +08:00
2012-03-21 17:55:01 -07:00
2012-03-24 10:08:39 -07:00
2012-03-28 18:30:03 +01:00
2011-01-16 13:47:07 -05:00
2012-03-04 20:54:01 -05:00
2012-02-23 12:05:21 -08:00
2012-03-23 14:02:12 -07:00
2012-03-04 09:34:15 -08:00
2012-03-09 08:26:05 +01:00
2012-03-16 10:38:24 -04:00
2012-03-28 17:14:36 -07:00
2012-03-23 16:58:31 -07:00
2012-02-07 12:54:56 -05:00
2012-03-24 10:41:37 -07:00
2012-03-13 22:37:14 +01:00
2012-03-04 23:08:46 +01:00
2012-03-16 21:49:24 +01:00
2012-03-23 16:58:38 -07:00
2012-03-04 17:54:34 -05:00
2012-03-16 10:38:24 -04:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-04 20:41:38 -05:00
2012-03-23 16:58:32 -07:00
2012-03-01 10:28:04 +01:00
2012-03-20 11:16:20 -07:00
2012-02-01 16:53:46 +08:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:38 -04:00
2012-03-28 17:14:37 -07:00
2012-03-24 10:08:39 -07:00
2012-02-21 09:03:41 -08:00
2012-02-21 09:06:08 -08:00
2012-03-24 10:41:37 -07:00
2012-03-24 10:08:39 -07:00
2012-03-20 21:29:43 -04:00
2012-03-20 21:29:42 -04:00
2012-03-04 17:54:34 -05:00
2012-03-06 19:14:37 +02:00
2012-03-16 10:38:24 -04:00
2012-03-16 10:38:24 -04:00
2012-03-21 17:54:57 -07:00
2012-02-08 22:53:58 +02:00
2012-03-15 18:23:10 -07:00
2012-02-21 16:56:45 -05:00
2012-03-28 18:30:03 +01:00
2012-03-07 11:32:21 +00:00
2012-03-04 17:54:34 -05:00
2012-03-28 15:58:21 -07:00
2012-03-21 13:25:04 -07:00
2012-03-24 10:08:39 -07:00
2012-03-09 12:47:56 -08:00
2012-03-16 10:38:24 -04:00
2012-03-08 11:38:50 -08:00
2012-03-12 22:19:13 +01:00
2012-02-01 22:23:53 +05:30
2012-02-16 17:08:09 -05:00
2012-02-24 11:42:50 -08:00
2012-03-28 15:58:21 -07:00
2012-03-06 11:01:33 +02:00
2012-03-28 15:04:26 -07:00
2012-03-28 17:14:35 -07:00
2012-03-19 16:53:08 -04:00
2012-03-11 19:11:22 -07:00
2012-03-23 13:18:57 +01:00
2012-03-28 15:58:21 -07:00
2012-02-21 09:06:09 -08:00
2012-02-24 10:05:59 +01:00
2012-03-28 18:30:03 +01:00
2012-02-10 10:44:35 -08:00
2012-02-17 23:36:23 +01:00
2012-03-28 17:14:35 -07:00
2012-03-04 17:54:34 -05:00
2012-02-10 11:42:25 -08:00
2012-03-04 17:54:34 -05:00
2012-02-20 12:48:47 -08:00
2012-03-13 14:06:33 -04:00
2012-03-01 17:57:40 -05:00
2012-03-29 18:12:23 -07:00
2012-03-22 19:43:43 -07:00
2012-03-20 21:29:40 -04:00
2012-03-23 16:58:40 -07:00
2012-02-24 10:05:59 +01:00
2012-03-04 17:54:34 -05:00
2012-03-08 11:38:51 -08:00
2012-03-28 18:30:03 +01:00
2012-03-13 14:24:07 -07:00
2012-03-19 15:33:24 -03:00
2012-03-04 17:54:34 -05:00
2012-03-27 16:30:09 -07:00
2012-02-19 09:50:20 -06:00
2012-03-08 10:50:35 -08:00
2012-03-28 18:30:03 +01:00
2012-03-27 20:15:37 +02:00
2012-03-02 10:51:00 +01:00
2012-03-07 16:08:46 +01:00
623ff7739e