David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/cavium/Kconfig The cavium conflict was overlapping dependency changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-08-13 16:23:11 -07:00
..
Kconfig	drivers/net: remove all references to obsolete Ethernet-HOWTO	2015-06-23 06:50:35 -07:00
Makefile	ethernet: Add new driver for Marvell Armada 375 network unit	2014-07-10 17:18:24 -07:00
mv643xx_eth.c	net: mv643xx_eth: Use setup_timer	2015-05-31 21:23:28 -07:00
mvmdio.c	net: mvmdio: Use devm_* API to simplify the code	2014-05-23 15:31:49 -04:00
mvneta.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-07-23 00:41:16 -07:00
mvpp2.c	net: mvpp2: replace TX coalescing interrupts with hrtimer	2015-08-10 10:57:00 -07:00
pxa168_eth.c	pxa168: fix double deallocation of managed resources	2015-04-26 16:05:49 -04:00
skge.c	skge: Unmask interrupts in case of spurious interrupts	2014-12-05 21:33:19 -08:00
skge.h
sky2.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
sky2.h