David S. Miller 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/tokenring/tmspci.c drivers/net/ucc_geth_mii.c		2009-03-05 02:06:47 -08:00
..
am79c961a.c	[NET] am79c961a: fix spin_lock usage	2009-01-24 23:21:33 +00:00
am79c961a.h	fix file specification in comments	2006-10-03 23:01:26 +02:00
at91_ether.c	drivers/net: Kill now superfluous ->last_rx stores.	2008-11-03 21:11:17 -08:00
at91_ether.h	at91_ether: use netstats in net_device structure	2008-07-22 19:45:41 -04:00
ep93xx_eth.c	net: Remove redundant NAPI functions	2009-01-21 14:33:50 -08:00
ether1.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
ether1.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ether3.c	net: convert print_mac to %pM	2008-10-27 17:06:18 -07:00
ether3.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
etherh.c	Revert "etherh: Get working again."	2009-02-22 19:54:16 -08:00
ixp4xx_eth.c	net: Remove redundant NAPI functions	2009-01-21 14:33:50 -08:00
Kconfig	IXP4xx: Add PHYLIB support to Ethernet driver.	2008-12-22 00:42:55 +01:00
ks8695net.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-03-05 02:06:47 -08:00
ks8695net.h	net: Add support for the KS8695 ethernet devices.	2008-12-11 21:00:29 -08:00
Makefile	Revert "etherh: Get working again."	2009-02-22 19:54:16 -08:00