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)
commita0f75f9d495b3905b4c658c1d813a127f558a350
treec91e6d70118ff2d15b129990cd82008acc286ce7
parentb5969138542fa2f5e4466c147abc0917ff78cefe
parent15fd830dd310e6cf589478e5e1e7733caf68e777
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)
drivers/pci/quirks.c
include/linux/pci_ids.h