David S. Miller 60747ef4d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor overlapping changes for both merge conflicts. Resolution work done by Stephen Rothwell was used as a reference. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-08-18 01:17:32 -04:00
..
cpmac.c	net: cpmac: fix error handling of cpmac_probe()	2016-07-20 14:46:01 -07:00
cpsw_ale.c
cpsw_ale.h
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-08-18 01:17:32 -04:00
cpsw.h	net: ethernet: ti: cpsw: remove rx_descs property	2016-06-17 21:27:57 -07:00
cpts.c
cpts.h
davinci_cpdma.c	net: ethernet: ti: cpdma: remove used_desc counter	2016-08-08 16:12:17 -07:00
davinci_cpdma.h	net: davinci_cpdma: remove excessive dump of register values to kernel log	2016-07-25 17:56:55 -07:00
davinci_emac.c	net: resolve symbol conflicts with generic hashtable.h	2016-08-10 17:18:52 -07:00
davinci_mdio.c	drivers: net: davinci_mdio: enable pm runtime auto for ti cpsw-mdio	2016-06-28 08:57:19 -04:00
Kconfig	net: cpsw: make TI_CPSW_PHY_SEL invisible	2016-07-16 21:27:43 -07:00
Makefile
netcp_core.c	treewide: replace dev->trans_start update with helper	2016-05-04 14:16:49 -04:00
netcp_ethss.c	phy: add phydev_name() wrapper	2016-01-07 14:31:25 -05:00
netcp_sgmii.c
netcp_xgbepcsr.c
netcp.h	netcp: add more __le32 annotations	2015-12-11 19:34:39 -05:00
tlan.c	net: tlan: don't set unused function argument	2016-06-16 17:33:12 -07:00
tlan.h