Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:39:24 +0000 (15:39 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 5 Nov 2005 20:39:24 +0000 (15:39 -0500)
commit7211bb9b64f17b23834d91fc3d0c1d78671ee9a8
tree541909f86c31fee97cd70d28ec2fe5c23e1ceb02
parentf1e691a24955ea987f021f378324fb5003b1b208
parent70d9d825e0a5a78ec1dacaaaf5c72ff5b0206fab
Merge branch 'master'
drivers/net/Kconfig
drivers/net/Makefile
include/linux/netdevice.h