David S. Miller 4963ed48f2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv4/arp.c The net/ipv4/arp.c conflict was one commit adding a new local variable while another commit was deleting one. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-09-26 16:08:27 -07: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
cpmac.c	MIPS: Remove all the uses of custom gpio.h	2015-09-03 12:08:02 +02:00
cpsw-common.c	drivers: net: cpsw-common: add support for reading mac address for dra7 and am437x platforms	2015-09-21 17:21:46 -07:00
cpsw-phy-sel.c	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
cpsw.c	drivers: net: cpsw: davinci_emac: move reading mac id to common file	2015-09-21 17:21:46 -07:00
cpsw.h	drivers: net: cpsw: davinci_emac: move reading mac id to common file	2015-09-21 17:21:46 -07: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
cpts.c	ptp: cpts: use helpers for converting ns to timespec.	2015-03-31 17:19:19 -04:00
cpts.h	time: move the timecounter/cyclecounter code into its own file.	2014-12-30 18:29:25 -05:00
davinci_cpdma.c	drivers: net: davinci_cpdma: remove spinlock as SOFTIRQ-unsafe lock order detected	2014-10-14 15:59:38 -04: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: Add support for fixed-link PHY	2015-09-23 15:06:27 -07:00
davinci_mdio.c	net: davinci_mdio: add hibernation callbacks	2015-03-01 13:40:22 -05:00
netcp.h	net: netcp: fix unused interface rx buffer size configuration	2015-08-07 00:02:36 -07:00
netcp_core.c	net: netcp: fix deadlock reported by lockup detector	2015-09-23 14:37:37 -07:00
netcp_ethss.c	net: netcp: ethss: fix error in calling sgmii api with incorrect offset	2015-09-23 14:37:36 -07: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
tlan.c	tlan: msecs_to_jiffies convrsion	2015-02-04 13:58:29 -08:00
tlan.h	tlan: Don't scream if no link	2014-07-07 17:06:52 -07:00