git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1104528 846fc70 100ebb2)
Merge branches 'pci/aer' and 'pci/virtualization' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 1 Oct 2014 18:30:58 +0000 (12:30 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 1 Oct 2014 18:30:58 +0000 (12:30 -0600)
* 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


Trivial merge
Pandora Kernel Repository