From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 26 Jun 2013 21:55:52 +0000 (-0600)
Subject: Merge branch 'pci/misc' into next
X-Git-Tag: firefly_0821_release~176^2~5787^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a0f75f9d495b3905b4c658c1d813a127f558a350;p=firefly-linux-kernel-4.4.55.git

Merge branch 'pci/misc' into next

* pci/misc:
  MAINTAINERS: Add ACPI folks for ACPI-related things under drivers/pci
  PCI: Add CircuitCo vendor ID and subsystem ID
  PCI: Use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)
---

a0f75f9d495b3905b4c658c1d813a127f558a350