| commit | 5899309c90971d5418abc4bf370bee871ff6072c | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Jun 07 14:24:00 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Jun 07 14:24:00 2013 -0600 |
| tree | 331b7922d0f3995110e130aa731dd7b2fbfea135 | |
| parent | bb4bac9308bf8df5027dcbf27f1016104e3a504f [diff] | |
| parent | 081d0fe0ef60c258b67428a8fdf2d14f8ce392ef [diff] |
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