David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05:00
..
cpmac.c	drivers/net: delete non-required instances of include <linux/init.h>	2014-01-16 11:53:26 -08:00
cpsw-phy-sel.c	net: ethernet: cpsw-phy-sel: Remove redundant of_match_ptr	2013-10-01 12:30:25 -04:00
cpsw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
cpsw.h	drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw	2013-09-24 10:33:07 -04:00
cpsw_ale.c	drivers: net: cpsw: enable promiscuous mode support	2014-01-23 13:12:14 -08:00
cpsw_ale.h	drivers: net: cpsw: enable promiscuous mode support	2014-01-23 13:12:14 -08:00
cpts.c	treewide: Fix typos in printk	2013-03-20 16:26:32 +01:00
cpts.h	ti: Remove extern from function prototypes	2013-09-24 12:54:10 -07:00
davinci_cpdma.c	net: eth: davinci_cpdma: Mark a local variable static	2013-12-11 19:53:55 -05:00
davinci_cpdma.h	net/davinci_cpdma: remove unused argument in cpdma_chan_submit()	2013-04-25 04:11:50 -04:00
davinci_emac.c	net: davinci_emac: Fix platform data handling and make usable for am3517	2013-12-05 20:39:36 -05:00
davinci_mdio.c	net: davinci_mdio: Fix sparse warning	2014-01-16 17:29:53 -08:00
Kconfig	drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw	2013-09-24 10:33:07 -04:00
Makefile	drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw	2013-09-24 10:33:07 -04:00
tlan.c	net: tlan: remove unnecessary pci_set_drvdata()	2013-10-23 16:58:41 -04:00
tlan.h	ThunderLAN: remove is_eisa flag	2013-05-20 00:20:14 -07:00