David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
Kconfig	net: davinci_mdio: reuse for keystone2 arch	2014-07-16 23:33:16 -07:00
Makefile	drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw	2013-09-24 10:33:07 -04:00
cpmac.c	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
cpsw-phy-sel.c	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
cpsw.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-09-23 12:09:27 -04: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: add support to dump ALE table via ethtool register dump	2014-07-22 19:58:25 -07:00
cpsw_ale.h	drivers: net: cpsw: add support to dump ALE table via ethtool register dump	2014-07-22 19:58:25 -07:00
cpts.c	ptp: Classify ptp over ip over vlan packets	2014-07-07 16:57:18 -07:00
cpts.h	ti: Remove extern from function prototypes	2013-09-24 12:54:10 -07:00
davinci_cpdma.c	drivers: net: davinci_cpdma: double free on error	2014-06-11 15:39:19 -07: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	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
davinci_mdio.c	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
tlan.c	PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use	2014-08-12 12:15:14 -06:00
tlan.h	tlan: Don't scream if no link	2014-07-07 17:06:52 -07:00