From: Bjorn Helgaas Date: Wed, 26 Jun 2013 21:55:52 +0000 (-0600) Subject: Merge branch 'pci/misc' into next X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a0f75f9d495b3905b4c658c1d813a127f558a350;p=openwrt%2Fstaging%2Fblogic.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