David S. Miller 1602f49b58 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts were two cases of simple overlapping changes, nothing serious. In the UDP case, we need to add a hlist_add_tail_rcu() to linux/rculist.h, because we've moved UDP socket handling away from using nulls lists. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-04-23 18:51:33 -04:00
..
cpmac.c	net: ti: cpmac: Fix build error due to missed API change	2016-01-10 23:34:49 -05:00
cpsw_ale.c	net: cpsw: remove two unused global functions	2015-05-25 18:19:09 -04:00
cpsw_ale.h	net: cpsw: remove two unused global functions	2015-05-25 18:19:09 -04:00
cpsw-common.c	net: cpsw: Fix ethernet regression for dm814x	2015-11-20 10:46:33 -05:00
cpsw-phy-sel.c	drivers: net: cpsw-phy-sel: add dev_warn() for unsupported PHY mode	2016-02-17 10:50:15 -05:00
cpsw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-04-23 18:51:33 -04:00
cpsw.h	drivers: net: cpsw: davinci_emac: move reading mac id to common file	2015-09-21 17:21:46 -07:00
cpts.c	ptp: cpts: use helpers for converting ns to timespec.	2015-03-31 17:19:19 -04:00
cpts.h
davinci_cpdma.c	net: davinci_cpdma: use dma_addr_t for DMA address	2016-01-29 20:33:38 -08:00
davinci_cpdma.h
davinci_emac.c	net: ethernet: davinci_emac: Fix platform_data overwrite	2016-04-21 14:57:47 -04:00
davinci_mdio.c	phy: Add API for {un}registering an mdio device to a bus.	2016-01-07 14:31:26 -05:00
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	drivers: net: cpsw: make cpsw_ale.c a module to allow re-use on Keystone	2015-01-31 17:33:07 -08:00
netcp_core.c	net: relax setup_tc ndo op handle restriction	2016-03-03 16:25:15 -05:00
netcp_ethss.c	phy: add phydev_name() wrapper	2016-01-07 14:31:25 -05:00
netcp_sgmii.c	net: netcp: Fixes SGMII reset on network interface shutdown	2015-07-27 01:14:26 -07:00
netcp_xgbepcsr.c	net: netcp: Enhance GBE driver to support 10G Ethernet	2015-01-19 15:07:39 -05:00
netcp.h	netcp: add more __le32 annotations	2015-12-11 19:34:39 -05:00
tlan.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
tlan.h