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 e40051d134 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/qlcnic/qlcnic_init.c net/ipv4/ip_output.c		15 years ago
..
21142.c	tulip/21142.c: Use dev_<level> and pr_<level>	15 years ago
Kconfig	dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips	15 years ago
Makefile	…
de4x5.c	drivers/net: return operator cleanup	15 years ago
de4x5.h	…
de2104x.c	de2104x: fix TP link detection	15 years ago
dmfe.c	drivers/net: Remove address use from assignments of function pointers	15 years ago
eeprom.c	drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts	15 years ago
interrupt.c	tulip: use integrated netdev stats	15 years ago
media.c	drivers/net: Remove unnecessary returns from void function()s	15 years ago
pnic.c	net: trans_start cleanups	15 years ago
pnic2.c	tulip/pnic2.c: Use dev_<level> and pr_<level>	15 years ago
timer.c	tulip/timer.c: Use dev_<level> and pr_<level>	15 years ago
tulip.h	tulip: use integrated netdev stats	15 years ago
tulip_core.c	tulip: use integrated netdev stats	15 years ago
uli526x.c	drivers/net: return operator cleanup	15 years ago
winbond-840.c	drivers/net: Remove address use from assignments of function pointers	15 years ago
xircom_cb.c	ethtool: Provide a default implementation of ethtool_ops::get_drvinfo	15 years ago