From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 14 Nov 2017 18:11:22 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: v4.15-rc1~95^2~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=65a129d7847e4f5b24c6e56ab49090b1f6d0f3dc;p=linux-2.6-block.git

Merge branch 'pci/misc' into next

* pci/misc:
  PCI: Fix kernel-doc build warning
  PCI: Move PCI_QUIRKS to the PCI bus menu
  alpha/PCI: Make pdev_save_srm_config() static
  PCI: Remove unused declarations
  PCI: Remove redundant pci_dev, pci_bus, resource declarations
  PCI: Remove redundant pcibios_set_master() declarations
  PCI/PME: Handle invalid data when reading Root Status
  x86/pci/intel_mid_pci: Constify intel_mid_pci_ops and make it __initconst
  PCI: Constify pci_dev_type structure
---

65a129d7847e4f5b24c6e56ab49090b1f6d0f3dc