Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Linus Torvalds [Tue, 26 Jul 2005 23:43:39 +0000 (16:43 -0700)]
1  2 
include/linux/pci_ids.h

Simple merge