]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b596913 15fd830)
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 patch | diff1 | diff2 | blob | history
include/linux/pci_ids.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/quirks.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
Michael's Linux tree.