Merge /spare/repo/linux-2.6/
authorJeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 20:40:27 +0000 (16:40 -0400)
committerJeff Garzik <jgarzik@pobox.com>
Mon, 29 Aug 2005 20:40:27 +0000 (16:40 -0400)
commitc1b054d03f5b31c33eaa0b267c629b118eaf3790
tree9333907ca767be24fcb3667877242976c3e3c8dd
parent559fb51ba7e66fe298b8355fabde1275b7def35f
parentbf4e70e54cf31dcca48d279c7f7e71328eebe749
Merge /spare/repo/linux-2.6/
drivers/net/Kconfig
drivers/net/Makefile
include/linux/pci_ids.h