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 9cbc1cb8cd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/feature-removal-schedule.txt drivers/scsi/fcoe/fcoe.c net/core/drop_monitor.c net/core/net-traces.c		16 years ago
..
3c359.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
3c359.h	3C359: use request_firmware	16 years ago
Kconfig	…
Makefile	…
abyss.c	tms380tr: convert to net_device_ops	16 years ago
abyss.h	…
ibmtr.c	…
lanstreamer.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
lanstreamer.h	…
madgemc.c	tokenring: convert drivers to net_device_ops	16 years ago
madgemc.h	…
olympic.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	16 years ago
olympic.h	olympic: convert to internal network device stats	16 years ago
proteon.c	tokenring: convert drivers to net_device_ops	16 years ago
skisa.c	tokenring: convert drivers to net_device_ops	16 years ago
smctr.c	net: use symbolic values for ndo_start_xmit() return codes	16 years ago
smctr.h	drivers/net/tokenring: fix sparse warning: cast truncates bits from const value	16 years ago
tms380tr.c	net: use symbolic values for ndo_start_xmit() return codes	16 years ago
tms380tr.h	tms380tr: convert to net_device_ops	16 years ago
tmspci.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago