OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitcc0cb67adb97793e76bf6f1f6e05694f6311cebd
treecddc39930146288a412f7817462249b1345b4f79tree | snapshot
parent1104528bc769bef26f837097459e1a6e4dae240ccommit | diff
parent846fc70986a65563a19ae86928c3acf34f12296dcommit | diff
parent100ebb2c48eaddd6a7ce9602d5d4c37f0a3c9232commit | 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
drivers/pci/quirks.c diff1 | diff2 | diff3 | blob | history
include/uapi/linux/pci_regs.h diff1 | diff2 | diff3 | blob | history
About OSDN
Find Software
Develop Software
Help