David S. Miller e1ec1b8ccd Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/s2io.c		2008-04-02 22:35:23 -07:00
..
21142.c	PCI: Cleanup the includes of <linux/pci.h>	2007-05-02 19:02:35 -07:00
Kconfig	remove the obsolete xircom_tulip_cb driver	2008-03-17 07:49:23 -04:00
Makefile	remove the obsolete xircom_tulip_cb driver	2008-03-17 07:49:23 -04:00
de4x5.c	[netdrvr] checkpatch cleanups	2008-01-28 15:04:05 -08:00
de4x5.h	more tulip endianness annotations	2007-10-14 12:41:52 -07:00
de2104x.c	2.6.25-rc4 de_stop_rxtx polling wrong	2008-03-17 08:11:31 -04:00
dmfe.c	[TULIP] DMFE: Fix SROM parsing regression.	2008-01-23 03:11:39 -08:00
eeprom.c	[netdrvr] tulip_read_eeprom fixes for BUG 4420	2008-03-28 21:52:14 -04:00
interrupt.c	[NET]: Do not check netif_running() and carrier state in ->poll()	2008-01-08 23:30:09 -08:00
media.c	TULIP: Natsemi dp83840a PHY fix	2007-04-28 11:00:58 -04:00
pnic.c	PCI: Cleanup the includes of <linux/pci.h>	2007-05-02 19:02:35 -07:00
pnic2.c	PCI: Cleanup the includes of <linux/pci.h>	2007-05-02 19:02:35 -07:00
timer.c	PCI: Cleanup the includes of <linux/pci.h>	2007-05-02 19:02:35 -07:00
tulip.h	tulip: endianness annotations	2007-10-10 16:52:00 -07:00
tulip_core.c	[netdrvr] tulip_read_eeprom fixes for BUG 4420	2008-03-28 21:52:14 -04:00
uli526x.c	uli526x partially recognizing interface	2008-02-23 23:55:03 -05:00
winbond-840.c	Typo: depricated -> deprecated	2007-10-20 03:10:57 +02:00
xircom_cb.c	xircom_cb should return NETDEV_TX_BUSY when no descriptors available	2008-02-05 13:31:29 -05:00