Bjorn Helgaas
4dc2db096a
Merge branch 'pci/aer' into next
* pci/aer:
PCI/AER: Fix aer_probe() kernel-doc comment
PCI/AER: Cache capability position
PCI/AER: Avoid memory allocation in interrupt handling path
ACPI / APEI: Send correct severity to calculate AER severity
PCI/AER: Remove duplicate AER severity translation
PCI/AER: Remove aerdriver.forceload kernel parameter
PCI/AER: Remove aerdriver.nosourceid kernel parameter
x86/PCI: VMD: Add quirk for AER to ignore source ID
PCI/AER: Add bus flag to skip source ID matching
Conflicts:
drivers/pci/probe.c
2016-10-03 09:42:57 -05:00
..
2016-03-08 15:52:13 -06:00
2014-01-13 12:18:55 -07:00
2016-09-27 16:01:49 -05:00
2016-09-20 14:35:59 -05:00
2016-10-03 09:42:57 -05:00
2016-09-27 14:30:36 -05:00
2009-11-24 15:25:17 -08:00
2015-01-07 13:08:04 +01:00
2009-12-16 13:37:54 -08:00