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
..
appletalk	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
arcnet	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
bonding	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
caif	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-03-09 14:34:20 -08:00
can	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
cris	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
dsa	drivers/net: dsa/mv88e6xxx.c files need linux/module.h	2012-01-24 15:44:50 -05:00
ethernet	MTD merge for 3.4	2012-03-30 17:31:56 -07:00
fddi
hamradio	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hippi	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
hyperv	net/hyperv: Fix the code handling tx busy	2012-03-19 17:27:06 -04:00
irda	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
phy	Generialize powerpc's irq_host as irq_domain	2012-03-21 10:27:19 -07:00
plip	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ppp	ppp: Replace uses of <linux/if_ppp.h> with <linux/ppp-ioctl.h>	2012-03-04 20:41:38 -05:00
slip	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
team	net: use eth_hw_addr_random() and reset addr_assign_type	2012-02-15 15:34:17 -05:00
tokenring	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
usb	net: add a truesize parameter to skb_add_rx_frag()	2012-03-25 13:29:58 -04:00
vmxnet3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-03-05 21:16:26 -05:00
wan	Documentation: remove references to /etc/modprobe.conf	2012-03-30 16:03:15 -07:00
wimax	wimax/i2400m: fix erroneous NETDEV_TX_BUSY use	2012-03-16 02:01:41 -07:00
wireless	Disintegrate and delete asm/system.h	2012-03-28 15:58:21 -07:00
xen-netback	drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages	2012-01-31 16:20:21 -05:00
dummy.c	net: use eth_hw_addr_random() and reset addr_assign_type	2012-02-15 15:34:17 -05:00
eql.c
ifb.c	net: replace random_ether_addr() with eth_hw_addr_random()	2012-02-15 15:34:16 -05:00
Kconfig	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2012-01-09 12:18:17 -08:00
LICENSE.SRC
loopback.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
macvlan.c	net: use eth_hw_addr_random() and reset addr_assign_type	2012-02-15 15:34:17 -05:00
macvtap.c	security: trim security.h	2012-02-14 10:45:42 +11:00
Makefile	Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging	2012-01-09 12:18:17 -08:00
mdio.c	ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd	2012-03-01 16:41:26 -05:00
mii.c	ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd	2012-03-01 16:41:26 -05:00
netconsole.c	drivers/net: Remove unnecessary k.alloc/v.alloc OOM messages	2012-01-31 16:20:21 -05:00
rionet.c	drivers/net: Remove alloc_etherdev error messages	2012-01-31 16:20:48 -05:00
sb1000.c
Space.c	CS89x0 : add platform driver support	2012-02-01 16:49:50 +01:00
sungem_phy.c
tun.c	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
veth.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-02-19 16:03:15 -05:00
virtio_net.c	net: replace random_ether_addr() with eth_hw_addr_random()	2012-02-15 15:34:16 -05:00
xen-netfront.c	One tiny feature that accidentally got lost in the initial git pull:	2012-03-24 12:20:25 -07:00