OSDN Git Service

Merge branch 'pci/aer'
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 13 May 2019 23:34:29 +0000 (18:34 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 13 May 2019 23:34:29 +0000 (18:34 -0500)
commit156752817cb090643f7e20094d17dbd2c3f14f0d
tree30bcf50ffcacdcfb4d8e10d9337b91c22b3ea7fc
parent9e98c678c2d6ae3a17cb2de55d17f69dddaa231b
parent31f996efbd5a7825f4d30150469e9d110aea00e8
Merge branch 'pci/aer'

  - Fix pci_aer_init() stub prototype for non-CONFIG_PCIEAER case (Jisheng
    Zhang)

* pci/aer:
  PCI/AER: Change pci_aer_init() stub to return void