kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'vmw_pvrdma' into merge-test

Browse source
This commit is contained in:
Doug Ledford 2016-12-14 14:56:21 -05:00
commit 6f94ba2079
21 changed files with 6009 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/linux/pci_ids.h
View file

@ -2251,6 +2251,7 @@
#define PCI_DEVICE_ID_RASTEL_2PORT 0x2000
#define PCI_VENDOR_ID_VMWARE 0x15ad
#define PCI_DEVICE_ID_VMWARE_VMXNET3 0x07b0
#define PCI_VENDOR_ID_ZOLTRIX 0x15b0
#define PCI_DEVICE_ID_ZOLTRIX_2BD0 0x2bd0