From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 1 Oct 2014 18:30:58 +0000 (-0600)
Subject: Merge branches 'pci/aer' and 'pci/virtualization' into next
X-Git-Tag: omap-for-v3.19/prcm-cleanup~136^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc0cb67adb97793e76bf6f1f6e05694f6311cebd;p=pandora-kernel.git

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
---

cc0cb67adb97793e76bf6f1f6e05694f6311cebd
Reading git-diff-tree failed