Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/scsi/sata_sil24.c
This commit is contained in:
@@ -1235,6 +1235,7 @@
|
||||
#define PCI_DEVICE_ID_VIA_8380_0 0x0204
|
||||
#define PCI_DEVICE_ID_VIA_3238_0 0x0238
|
||||
#define PCI_DEVICE_ID_VIA_PT880 0x0258
|
||||
#define PCI_DEVICE_ID_VIA_PT880ULTRA 0x0308
|
||||
#define PCI_DEVICE_ID_VIA_PX8X0_0 0x0259
|
||||
#define PCI_DEVICE_ID_VIA_3269_0 0x0269
|
||||
#define PCI_DEVICE_ID_VIA_K8T800PRO_0 0x0282
|
||||
|
Reference in New Issue
Block a user