Linus Torvalds 623ff7739e MTD merge for 3.4 ... 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>. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAk92K6UACgkQdwG7hYl686NrMACfWQJRWasR78MWKfkT2vWZwTFJ X5AAoKiSYO2pfo5gWJGOAahNC1zUqMX0 =i3Vb -----END PGP SIGNATURE----- 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
..
clock.h	ARM i.MX23/28: remove secondary field from struct clk. It's unused	2011-01-24 09:01:48 +01:00
common.h	ARM: mxs: Use a proper timeout mechanism	2012-01-31 22:42:15 +08:00
debug-macro.S	Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:34:22 -07:00
devices-common.h	ARM: mxs: add GPMI-NAND support for imx23/imx28	2012-02-11 07:39:53 -08:00
digctl.h	ARM: mxs: detect SoC by checking CHIPID register	2012-01-27 11:47:37 +08:00
entry-macro.S	ARM: remove disable_fiq and arch_ret_to_user macros	2012-02-21 17:05:18 -06:00
gpio.h	Merge branch 'depends/rmk/gpio' into next/devel	2011-10-31 23:46:42 +01:00
hardware.h	ARM: create a common IOMEM definition	2012-03-13 21:22:09 -05:00
iomux-mx23.h	ARM: mxs: fix typo "GPO" in iomux-mx23.h	2011-03-07 19:29:47 +01:00
iomux-mx28.h	ARM: mxs: Add iomux support	2010-12-20 17:29:58 +01:00
iomux.h	ARM: mxs: add helper macro for pad control	2011-03-07 19:29:45 +01:00
irqs.h
mmc.h	mmc: mxs-mmc: add mmc host driver for i.MX23/28	2011-03-15 13:49:37 -04:00
mx23.h	ARM: mxs/i.MX23: make i2c defines consistent and match the reference manual	2011-05-19 13:11:21 +02:00
mx28.h	ARM: mx28: LRADC macro rename	2011-12-02 13:27:23 +08:00
mxs.h	ARM: mxs: detect SoC by checking CHIPID register	2012-01-27 11:47:37 +08:00
mxsfb.h	video: Add i.MX23/28 framebuffer driver	2011-03-07 19:29:30 +01:00
timex.h	ARM: mxs: Add helper definition and function	2010-12-13 14:49:50 +01:00
uncompress.h	ARM: mxs: detect SoC by checking CHIPID register	2012-01-27 11:47:37 +08:00