Merge branch 'upstream-fixes'
authorJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:31 +0000 (13:35 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 11 Mar 2006 18:35:31 +0000 (13:35 -0500)
commit749dfc70554f2c9e6624ac843d66571265ed9338
treebf591255b3f158222f90852d53c4279e6e7e9ced
parent74f5ec29ae93aa42c49f4285c20c457afe937881
parent0992a5d029181421877a716eaf99145828ff7eae
Merge branch 'upstream-fixes'
Documentation/feature-removal-schedule.txt
drivers/net/Kconfig
drivers/net/dl2k.c
drivers/net/e1000/e1000_main.c
drivers/net/tg3.c
drivers/net/tulip/de2104x.c