Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

This commit is contained in:
Linus Torvalds
2005-07-26 13:28:47 -07:00
106 changed files with 35019 additions and 30487 deletions
+9
View File
@@ -911,6 +911,15 @@
#define PCI_DEVICE_ID_QLOGIC_ISP1022 0x1022
#define PCI_DEVICE_ID_QLOGIC_ISP2100 0x2100
#define PCI_DEVICE_ID_QLOGIC_ISP2200 0x2200
#define PCI_DEVICE_ID_QLOGIC_ISP2300 0x2300
#define PCI_DEVICE_ID_QLOGIC_ISP2312 0x2312
#define PCI_DEVICE_ID_QLOGIC_ISP2322 0x2322
#define PCI_DEVICE_ID_QLOGIC_ISP6312 0x6312
#define PCI_DEVICE_ID_QLOGIC_ISP6322 0x6322
#define PCI_DEVICE_ID_QLOGIC_ISP2422 0x2422
#define PCI_DEVICE_ID_QLOGIC_ISP2432 0x2432
#define PCI_DEVICE_ID_QLOGIC_ISP2512 0x2512
#define PCI_DEVICE_ID_QLOGIC_ISP2522 0x2522
#define PCI_VENDOR_ID_CYRIX 0x1078
#define PCI_DEVICE_ID_CYRIX_5510 0x0000