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
..
include/mach	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
Kconfig	pinctrl: rename U300 and SIRF pin controllers	2012-01-03 09:10:08 +01:00
Makefile	ARM: 7335/1: mach-u300: do away with MMC config files	2012-02-23 22:22:45 +00:00
Makefile.boot	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
clock.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
clock.h	ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors	2011-06-09 10:15:06 +01:00
core.c	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
dummyspichip.c	spi/pl022: Add spi->mode support to AMBA SPI driver	2010-10-12 21:37:37 -06:00
i2c.c	ARM: U300: Don't specify regulator consumers by struct device	2012-02-17 13:42:49 -08:00
i2c.h	ARM: 5668/2: U300 I2C board setup	2009-08-15 15:36:29 +01:00
regulator.c	ARM: 5724/1: U300 AB3100 boardinfo v5	2009-10-19 17:10:09 +01:00
spi.c	pinctrl: add a driver for the U300 pinmux	2011-10-13 12:57:45 +02:00
spi.h	ARM: 5667/3: U300 SSP/SPI board setup and test	2009-08-15 15:36:29 +01:00
timer.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00
u300-gpio.h	ARM: u300: localize GPIO assignments	2012-01-03 09:10:03 +01:00
u300.c	Merge branch 'depends/rmk/restart' into next/cleanup	2012-01-07 11:51:28 +00:00