Merge nuts.ninka.net:/home/davem/src/BK/network-2.5

author David S. Miller <davem@nuts.ninka.net>

Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)

committer David S. Miller <davem@nuts.ninka.net>

Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)
author David S. Miller <davem@nuts.ninka.net>
Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)
committer David S. Miller <davem@nuts.ninka.net>
Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/pci/pci.ids
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	David S. Miller <davem@nuts.ninka.net>
	Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)
committer	David S. Miller <davem@nuts.ninka.net>
	Fri, 25 Jul 2003 08:56:55 +0000 (01:56 -0700)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/pci/pci.ids	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history