Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 26 Jun 2013 21:55:52 +0000 (15:55 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 26 Jun 2013 21:55:52 +0000 (15:55 -0600)
* 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)

1  2 
drivers/pci/quirks.c
include/linux/pci_ids.h

Simple merge
Simple merge