Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Thu, 22 Sep 2005 02:30:42 +0000 (22:30 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 22 Sep 2005 02:30:42 +0000 (22:30 -0400)
1  2 
drivers/net/Kconfig

Simple merge