Merge redhat.com:/spare/repo/netdev-2.6/s2io

author Jeff Garzik <jgarzik@redhat.com>

Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)

committer Jeff Garzik <jgarzik@redhat.com>

Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
author Jeff Garzik <jgarzik@redhat.com>
Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
committer Jeff Garzik <jgarzik@redhat.com>
Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
diff --cc drivers/net/Kconfig
Simple merge
diff --cc drivers/net/Makefile
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Jeff Garzik <jgarzik@redhat.com>
	Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
committer	Jeff Garzik <jgarzik@redhat.com>
	Tue, 13 Apr 2004 11:01:53 +0000 (07:01 -0400)
		1	2
drivers/net/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history