David S. Miller f188b951f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-12-03 21:09:12 -05:00
..
cpmac.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -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
cpsw-common.c	net: cpsw: Fix ethernet regression for dm814x	2015-11-20 10:46:33 -05:00
cpsw-phy-sel.c	drivers/net/ethernet: make ti/cpsw-phy-sel.c explicitly non-modular	2015-10-09 07:52:29 -07:00
cpsw.c	net: add netif_tx_napi_add()	2015-11-18 16:17:41 -05: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	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
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: add netif_tx_napi_add()	2015-11-18 16:17:41 -05:00
netcp_ethss.c	net: netcp: add missing of_node_put	2015-10-26 22:08:10 -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
netcp.h	net: netcp: fix unused interface rx buffer size configuration	2015-08-07 00:02:36 -07:00
tlan.c	drivers/net: get rid of unnecessary initializations in .get_drvinfo()	2015-10-16 00:24:10 -07:00
tlan.h	tlan: Don't scream if no link	2014-07-07 17:06:52 -07:00