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 508827ff0a Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/tokenring/tmspci.c drivers/net/ucc_geth_mii.c		16 years ago
..
Kconfig	IXP4xx: Add PHYLIB support to Ethernet driver.	16 years ago
Makefile	Revert "etherh: Get working again."	16 years ago
am79c961a.c	[NET] am79c961a: fix spin_lock usage	16 years ago
am79c961a.h	…
at91_ether.c	drivers/net: Kill now superfluous ->last_rx stores.	16 years ago
at91_ether.h	…
ep93xx_eth.c	net: Remove redundant NAPI functions	16 years ago
ether1.c	net: convert print_mac to %pM	17 years ago
ether1.h	…
ether3.c	net: convert print_mac to %pM	17 years ago
ether3.h	…
etherh.c	Revert "etherh: Get working again."	16 years ago
ixp4xx_eth.c	net: Remove redundant NAPI functions	16 years ago
ks8695net.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
ks8695net.h	net: Add support for the KS8695 ethernet devices.	16 years ago