You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		16 years ago
..
21142.c	tulip: fix 21142 with 10Mbps without negotiation	16 years ago
Kconfig	remove the obsolete xircom_tulip_cb driver	17 years ago
Makefile	remove the obsolete xircom_tulip_cb driver	17 years ago
de4x5.c	tulip: get rid of warning for non-const string literal	16 years ago
de4x5.h	de4x5: Remove developer debug feature about set/clear promisc	17 years ago
de2104x.c	de2104x: force correct order when writing to rx ring	16 years ago
dmfe.c	tulip: get rid of warning for non-const string literal	16 years ago
eeprom.c	netdevice: safe convert to netdev_priv() #part-3	16 years ago
interrupt.c	tulip: Fix for MTU problems with 802.1q tagged frames	16 years ago
media.c	drivers/net/tulip: fix sparse warning: symbol shadows an earlier one	16 years ago
pnic.c	drivers/net/tulip: update first comment in tulip files	17 years ago
pnic2.c	drivers/net/tulip: update first comment in tulip files	17 years ago
timer.c	drivers/net/tulip: update first comment in tulip files	17 years ago
tulip.h	tulip: Fix for MTU problems with 802.1q tagged frames	16 years ago
tulip_core.c	tulip: fix crash on iface up with shirq debug	16 years ago
uli526x.c	tulip: get rid of warning for non-const string literal	16 years ago
winbond-840.c	tulip: get rid of warning for non-const string literal	16 years ago
xircom_cb.c	xircom: convert devices to new API	16 years ago