diff options
author | 2016-10-03 09:42:57 -0500 | |
---|---|---|
committer | 2016-10-03 09:42:57 -0500 | |
commit | 4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf (patch) | |
tree | 99563a111f0f5c0b2d8e90acfe840c7db1d0c603 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Merge branch 'pci/ptm' into next (diff) | |
parent | PCI/AER: Fix aer_probe() kernel-doc comment (diff) | |
download | wireguard-linux-4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf.tar.xz wireguard-linux-4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf.zip |
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
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions