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)
  - 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


Trivial merge