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
..
alchemy	MIPS: Alchemy: Increase minimum timeout for 32kHz timer.	2012-02-20 18:33:18 +01:00
ar7	Merge branches 'next/ar7', 'next/ath79', 'next/bcm63xx', 'next/bmips', 'next/cavium', 'next/generic', 'next/kprobes', 'next/lantiq', 'next/perf' and 'next/raza' into mips-for-linux-next	2012-01-11 15:42:31 +01:00
ath79	USB: use generic platform driver on ath79	2012-03-15 12:45:43 -07:00
bcm47xx	MIPS: BCM47XX: provide sprom to bcma bus	2012-03-05 15:20:51 -05:00
bcm63xx	mips: Fix typo in bcm63xx/setup.c	2012-02-05 17:14:47 +01:00
boot	MIPS: Alchemy: Basic support for the DB1300 board.	2011-12-07 22:02:06 +00:00
cavium-octeon	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
cobalt	MIPS: Mark cascade and low level interrupts IRQF_NO_THREAD	2011-09-21 17:52:15 +02:00
configs	locking/kconfig: Simplify INLINE_SPIN_UNLOCK usage	2012-03-23 13:18:57 +01:00
dec	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
emma	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
fw	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
include/asm	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
jazz	Merge branch 'next/generic' into mips-for-linux-next	2012-01-11 15:41:47 +01:00
jz4740	ASoC: jz4740: Convert qi_lb60 to use snd_soc_register_card()	2012-01-20 13:58:29 +00:00
kernel	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2012-03-29 18:12:23 -07:00
lantiq	Merge branch 'next/generic' into mips-for-linux-next	2012-01-11 15:41:47 +01:00
lasat	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
lib	mips: use the the PCI controller's io_map_base	2012-01-31 23:20:30 +02:00
loongson	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
math-emu	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mipssim	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mm	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
mti-malta	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
netlogic	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
oprofile	MIPS: oprofile: Add callgraph support	2011-06-15 14:35:34 +02:00
pci	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
pmc-sierra	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
pnx833x	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
pnx8550	MIPS: irq: Remove IRQF_DISABLED	2011-12-07 22:03:45 +00:00
power	MIPS: Hibernation: Fixes for PAGE_SIZE >= 64kb	2011-05-10 18:15:26 +01:00
powertv	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
rb532	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sgi-ip22	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sgi-ip27	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sgi-ip32	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sibyte	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
sni	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
txx9	MIPS: txx9 7segled fix struct device has no member	2012-02-20 18:33:18 +01:00
vr41xx	Disintegrate asm/system.h for MIPS	2012-03-28 18:30:02 +01:00
wrppmc	MIPS: WRPPMC: Migrate to new platform makefile style.	2010-08-05 13:25:51 +01:00
Kbuild	MIPS: Repair Kbuild make clean breakage.	2010-10-19 18:32:39 +01:00
Kbuild.platforms	MIPS: XLR, XLS: Move makefile bits to were they belong.	2011-07-20 23:12:11 +01:00
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2012-03-29 14:49:45 -07:00
Kconfig.debug	lib: consolidate DEBUG_STACK_USAGE option	2011-05-25 08:39:54 -07:00
Makefile	MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS	2011-12-07 22:03:17 +00:00