David S. Miller 76fef2b6bf Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... Conflicts: drivers/s390/net/qeth_main.c		2008-03-22 18:22:42 -07:00
..
21142.c
de4x5.c	[netdrvr] checkpatch cleanups	2008-01-28 15:04:05 -08:00
de4x5.h
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
interrupt.c
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
media.c
pnic2.c
pnic.c
timer.c
tulip_core.c	endianness noise in tulip_core	2008-01-12 17:33:04 -05:00
tulip.h
uli526x.c	uli526x partially recognizing interface	2008-02-23 23:55:03 -05:00
winbond-840.c
xircom_cb.c	xircom_cb should return NETDEV_TX_BUSY when no descriptors available	2008-02-05 13:31:29 -05:00