David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-01-15 00:53:17 -05:00
..
cpmac.c	ethernet: ti: remove unwanted THIS_MODULE macro	2014-09-09 11:59:14 -07:00
cpsw_ale.c	drivers: net: cpsw: fix multicast flush in dual emac mode	2015-01-13 16:54:23 -05:00
cpsw_ale.h	drivers: net: cpsw: fix multicast flush in dual emac mode	2015-01-13 16:54:23 -05: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: fix multicast flush in dual emac mode	2015-01-13 16:54:23 -05:00
cpsw.h	net: cpsw: header, Add missing include	2014-09-30 01:30:43 -04:00
cpts.c	net: cpts: convert to timecounter adjtime.	2014-12-30 18:29:27 -05: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	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
Kconfig	drivers: net : cpsw: Update Kconfig for CPSW	2014-12-09 13:44:16 -05:00
Makefile	drivers: net: cpsw-phy-sel: Add new driver for phy mode selection for cpsw	2013-09-24 10:33:07 -04: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