David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
xgbe	amd-xgbe: Request IRQs only after driver is fully setup	2015-02-27 17:13:02 -05:00
7990.c
7990.h
a2065.c
a2065.h
am79c961a.c
am79c961a.h
amd8111e.c	net: rename vlan_tx_* helpers since "tx" is misleading there	2015-01-13 17:51:08 -05:00
amd8111e.h
ariadne.c
ariadne.h
atarilance.c	net: atarilance: Remove obsolete IRQ_TYPE_PRIO	2015-01-15 13:44:50 +01:00
au1000_eth.c	net: ethernet: amd: drop owner assignment from platform_drivers	2014-10-20 16:21:04 +02:00
au1000_eth.h
declance.c	declance: Fix 64-bit compilation warnings	2014-07-08 14:04:30 -07:00
hplance.c
hplance.h
Kconfig	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-02-05 14:33:28 -08:00
lance.c
Makefile
mvme147.c
ni65.c
ni65.h
nmclan_cs.c	net: am2150: fix nmclan_cs.c shared interrupt handling	2015-01-29 15:08:21 -08:00
pcnet32.c	ethernet: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:36 -05:00
sun3lance.c
sunlance.c	net: ethernet: amd: drop owner assignment from platform_drivers	2014-10-20 16:21:04 +02:00