Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 10:51:24 +0000 (05:51 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 11 Nov 2005 10:51:24 +0000 (05:51 -0500)
commit3b621ee5df437d3f332a635ab6421aaa61a7dc2b
treec4a5236cee8eb7418770802313d36a55f1cc0b1e
parent7211bb9b64f17b23834d91fc3d0c1d78671ee9a8
parent5e04e7fe774794b837e1d3897e6b96ae2d06679a
Merge branch 'master'
drivers/net/Kconfig
drivers/net/Makefile
include/linux/netdevice.h