diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 12:30:58 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-01 12:30:58 -0600 |
| commit | cc0cb67adb97793e76bf6f1f6e05694f6311cebd (patch) | |
| tree | cddc39930146288a412f7817462249b1345b4f79 /include/linux/bcm47xx_wdt.h | |
| parent | 1104528bc769bef26f837097459e1a6e4dae240c (diff) | |
| parent | 846fc70986a65563a19ae86928c3acf34f12296d (diff) | |
| parent | 100ebb2c48eaddd6a7ce9602d5d4c37f0a3c9232 (diff) | |
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