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)
commita28afda8cc6a45b2c5a4f98cf8fcddd877597701
tree2ad4d76e22ddb294fcf31d06b79e7464c70c653a
parente1c171b86baaccab983ded5dfa1663c0981d2520
parentdefb9446fe417f72855bc8bf97aa5d8af076bdf8
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
drivers/pci/pci.c
include/linux/pci.h
include/linux/pci_regs.h