diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-07 14:24:00 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-07 14:24:00 -0600 |
| commit | 5899309c90971d5418abc4bf370bee871ff6072c (patch) | |
| tree | 331b7922d0f3995110e130aa731dd7b2fbfea135 /drivers/spi/spi-sh-msiof.c | |
| 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
Diffstat (limited to 'drivers/spi/spi-sh-msiof.c')
0 files changed, 0 insertions, 0 deletions