Merge SCSI misc branch into isci-for-3.6 tag

This commit is contained in:
James Bottomley
2012-10-02 08:55:12 +01:00
176 changed files with 13507 additions and 4475 deletions

View File

@@ -753,6 +753,7 @@
#define PCI_DEVICE_ID_HP_CISSD 0x3238
#define PCI_DEVICE_ID_HP_CISSE 0x323a
#define PCI_DEVICE_ID_HP_CISSF 0x323b
#define PCI_DEVICE_ID_HP_CISSH 0x323c
#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
#define PCI_VENDOR_ID_PCTECH 0x1042