From: Bjorn Helgaas Date: Fri, 7 Jun 2013 20:24:00 +0000 (-0600) Subject: Merge branch 'pci/betty-aer-v3' into next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5899309c90971d5418abc4bf370bee871ff6072c;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'pci/betty-aer-v3' into next * pci/betty-aer-v3: PCI/AER: Reset link for devices below Root Port or Downstream Port ACPI / APEI: Force fatal AER severity when component has been reset PCI/AER: Remove "extern" from function declarations PCI/AER: Move AER severity defines to aer.h PCI/AER: Set dev->__aer_firmware_first only for matching devices PCI/AER: Factor out HEST device type matching PCI/AER: Don't parse HEST table for non-PCIe devices --- 5899309c90971d5418abc4bf370bee871ff6072c