Merge branch 'pci/bjorn-find-next-ext-cap' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 24 Aug 2012 00:32:36 +0000 (18:32 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 24 Aug 2012 00:32:36 +0000 (18:32 -0600)
* 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


Trivial merge