David S. Miller 6cdee2f96a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/yellowfin.c		2009-09-02 00:32:56 -07:00
..
am79c961a.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
am79c961a.h	fix file specification in comments	2006-10-03 23:01:26 +02:00
at91_ether.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-23 19:03:51 -07:00
at91_ether.h	at91_ether: use netstats in net_device structure	2008-07-22 19:45:41 -04:00
ep93xx_eth.c	net: replace dma_sync_single with dma_sync_single_for_cpu	2009-05-29 01:51:22 -07:00
ether1.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
ether1.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
ether3.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -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	netdev: restore MTU change operation	2009-07-12 14:20:04 -07:00
Kconfig	Add mac driver for w90p910	2009-07-20 07:45:05 -07: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	Add mac driver for w90p910	2009-07-20 07:45:05 -07:00
w90p910_ether.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-09-02 00:32:56 -07:00