Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:17:52 +0000 (12:17 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Fri, 28 Oct 2005 16:17:52 +0000 (12:17 -0400)
commit90890687859ea658759e653c4e70ed7e9e1a6217
tree9065b30bb189e16ef99b8b5a0d444558f8dc579f
parent2995bfb7855aabd493f840af361f3dd7d221caea
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e
Merge branch 'master'
drivers/net/Kconfig
drivers/net/Makefile
include/linux/netdevice.h