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
..
bbm.h	mtd: nand: write BBM to OOB even with flash-based BBT	2012-03-27 00:27:02 +01:00
blktrans.h	mtd: mtdblock: call mtd_sync() only if opened for write	2012-03-27 00:11:11 +01:00
cfi_endian.h	mtd: cfi: Allow per-mapping CFI device endianness	2012-01-09 18:06:13 +00:00
cfi.h	BUG: headers with BUG/BUG_ON etc. need linux/bug.h	2012-03-04 17:54:34 -05:00
concat.h
doc2000.h
flashchip.h
fsmc.h	mtd: Add device-tree support to fsmc_nand	2012-03-27 01:01:07 +01:00
ftl.h
gen_probe.h
gpmi-nand.h	mtd: fix compile error for gpmi-nand	2011-12-23 21:33:15 +05:30
inftl.h
latch-addr-flash.h
map.h	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
mtd.h	mtd: add ecc_strength fields to mtd structs	2012-03-27 00:56:36 +01:00
mtdram.h
nand_bch.h
nand_ecc.h
nand-gpio.h
nand.h	mtd: add ecc_strength fields to mtd structs	2012-03-27 00:56:36 +01:00
ndfc.h
nftl.h
onenand_regs.h
onenand.h
partitions.h
pfow.h
physmap.h	mtd: maps: physmap: allow partition parsers for physmap_flash_data	2012-01-09 18:16:15 +00:00
pismo.h
plat-ram.h
qinfo.h
sh_flctl.h	mtd: sh_flctl: Add power management with QoS request	2012-03-27 00:53:34 +01:00
sharpsl.h
spear_smi.h	mtd: add device-tree support to spear_smi	2012-03-27 01:01:21 +01:00
super.h
ubi.h
xip.h