tree 2ad4d76e22ddb294fcf31d06b79e7464c70c653a
parent e1c171b86baaccab983ded5dfa1663c0981d2520
parent defb9446fe417f72855bc8bf97aa5d8af076bdf8
author Bjorn Helgaas <bhelgaas@google.com> 1345768356 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1345768356 -0600

Merge branch 'pci/bjorn-find-next-ext-cap' into next

* pci/bjorn-find-next-ext-cap:
  PCI: Add Vendor-Specific Extended Capability header info
  PCI: Add pci_find_next_ext_capability()

Conflicts:
	drivers/pci/pci.c