Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 06:47:12 +0000 (01:47 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 06:47:12 +0000 (01:47 -0500)
commit3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb
tree7f8d84353852401ec74e005f6f0b1eb958b9a70d
parentc0d3c0c0ce94d3db893577ae98e64414d92e49d8
parentc03296a868ae7c91aa2d8b372184763b18f16d7a
Merge branch 'master'
Documentation/feature-removal-schedule.txt
drivers/net/3c59x.c
drivers/net/wireless/ipw2200.c
net/Kconfig
net/core/dev.c
net/socket.c