David S. Miller 2b1c4354de Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/virtio_net.c		2009-03-20 02:27:41 -07:00
..
21142.c	tulip: fix 21142 with 10Mbps without negotiation	2009-01-29 17:35:04 -08: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	tulip: get rid of warning for non-const string literal	2009-02-26 22:21:53 -08:00
de4x5.h	de4x5: Remove developer debug feature about set/clear promisc	2008-07-22 16:09:09 -04:00
de2104x.c	de2104x: force correct order when writing to rx ring	2009-02-08 17:50:34 -08:00
dmfe.c	tulip: get rid of warning for non-const string literal	2009-02-26 22:21:53 -08:00
eeprom.c	netdevice: safe convert to netdev_priv() #part-3	2008-11-12 23:38:36 -08:00
interrupt.c	tulip: Fix for MTU problems with 802.1q tagged frames	2009-03-13 15:43:38 -07:00
media.c	drivers/net/tulip: fix sparse warning: symbol shadows an earlier one	2009-02-17 19:34:46 -08:00
pnic.c	drivers/net/tulip: update first comment in tulip files	2008-06-24 22:59:26 -04:00
pnic2.c	drivers/net/tulip: update first comment in tulip files	2008-06-24 22:59:26 -04:00
timer.c	drivers/net/tulip: update first comment in tulip files	2008-06-24 22:59:26 -04:00
tulip.h	tulip: Fix for MTU problems with 802.1q tagged frames	2009-03-13 15:43:38 -07:00
tulip_core.c	tulip: fix crash on iface up with shirq debug	2009-03-18 18:49:01 -07:00
uli526x.c	tulip: get rid of warning for non-const string literal	2009-02-26 22:21:53 -08:00
winbond-840.c	tulip: get rid of warning for non-const string literal	2009-02-26 22:21:53 -08:00
xircom_cb.c	xircom: convert devices to new API	2009-01-07 18:00:55 -08:00