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
..
aoa	ALSA: aoa: Convert onyx and tas codec drivers to module_i2c_driver	2012-01-27 15:18:28 +01:00
arm	ARM: cleanups of io includes	2012-03-29 18:02:10 -07:00
atmel	dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config changes	2012-02-22 18:15:39 +05:30
core	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
drivers	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
firewire	IEEE 1394 (FireWire) subsystem updates post v3.3:	2012-03-22 20:31:15 -07:00
i2c	[media] tea575x: fix HW seek	2012-03-19 11:28:52 -03:00
isa	ALSA: fix isa/opti9xx module param type	2012-03-29 17:57:08 +02:00
mips	ALSA: Convert mips directory to module_platform_driver	2011-11-24 13:03:02 +01:00
oss	sound fixes for 3.4-rc1	2012-03-30 10:59:52 -07:00
parisc
pci	sound fixes for 3.4-rc1	2012-03-30 10:59:52 -07:00
pcmcia	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
ppc	Merge branch 'topic/misc' into for-linus	2012-01-12 09:59:14 +01:00
sh	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
soc	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
sparc	ALSA: module_param: make bool parameters really bool	2011-12-19 10:34:41 +01:00
spi	ALSA: Convert at73c213 to module_spi_driver	2012-01-27 15:18:36 +01:00
synth	sound: Add export.h for THIS_MODULE/EXPORT_SYMBOL where needed	2011-10-31 19:31:22 -04:00
usb	Merge branch 'topic/misc' into for-linus	2012-03-18 18:22:33 +01:00
ac97_bus.c
Kconfig	um: switch to use of drivers/Kconfig	2011-11-02 14:15:41 +01:00
last.c
Makefile
sound_core.c	switch device_get_devnode() and ->devnode() to umode_t *	2012-01-03 22:54:55 -05:00
sound_firmware.c