| commit | a0f75f9d495b3905b4c658c1d813a127f558a350 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Jun 26 15:55:52 2013 -0600 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Jun 26 15:55:52 2013 -0600 |
| tree | c91e6d70118ff2d15b129990cd82008acc286ce7 | |
| parent | b5969138542fa2f5e4466c147abc0917ff78cefe [diff] | |
| parent | 15fd830dd310e6cf589478e5e1e7733caf68e777 [diff] |
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)