diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 20:30:58 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 20:30:58 +0200 |
| commit | cc0cb67adb97793e76bf6f1f6e05694f6311cebd (patch) | |
| tree | cddc39930146288a412f7817462249b1345b4f79 /drivers/pci | |
| parent | Merge branch 'pci/host-designware' into next (diff) | |
| parent | PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND (diff) | |
| parent | PCI: Add ACS quirk for Intel 10G NICs (diff) | |
| download | linux-cc0cb67adb97793e76bf6f1f6e05694f6311cebd.tar.xz linux-cc0cb67adb97793e76bf6f1f6e05694f6311cebd.zip | |
Merge branches 'pci/aer' and 'pci/virtualization' into next
* pci/aer:
PCI/AER: Rename PCI_ERR_UNC_TRAIN to PCI_ERR_UNC_UND
PCI/AER: Add additional PCIe AER error strings
trace, RAS: Add additional PCIe AER error strings
trace, RAS: Replace bare numbers with #defines for PCIe AER error strings
* pci/virtualization:
PCI: Add ACS quirk for Intel 10G NICs