Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Linus Torvalds [Mon, 3 Oct 2005 15:07:10 +0000 (08:07 -0700)]
1  2 
include/linux/pci_ids.h

Simple merge