Merge branch 'pci/aer'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 4 Apr 2018 18:27:36 +0000 (13:27 -0500)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 4 Apr 2018 18:27:36 +0000 (13:27 -0500)
commit63d5ce5fc854293a4f479ff6992ef4efe76ac457
treea8df44b4b1d68716fcb3ca4030b10a18d930edfc
parent7928b2cbe55b2a410a0f5c1f154610059c57b1b2
parent3ecac020d6dd09259414f423b577347ebee9f533
Merge branch 'pci/aer'

  - move pci_uevent_ers() out of pci.h (Michael Ellerman)

* pci/aer:
  PCI/AER: Move pci_uevent_ers() out of pci.h