Merge branch 'topic/bjorn-remove-unused' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:51 +0000 (17:04 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 13 Jun 2012 23:04:51 +0000 (17:04 -0600)
commit10c480933d0ad2ea27630cbaa723a5d33dbece00
tree6938c675ca99e1204d701b4fb60af89d381beeff
parenta187177ae047e005a7b40229555837a529a9c2cc
parent505cf30b7f4ef64c6db36f34adbe4a7ad9081fd3
Merge branch 'topic/bjorn-remove-unused' into next

* topic/bjorn-remove-unused:
  PCI/AER: use pci_is_pcie() instead of obsolete pci_dev.is_pcie
  PCI: remove pci_max_busnr() (was already commented out)
  PCI: remove pci_bus_find_ext_capability() (unused)
drivers/pci/pci.c
include/linux/pci.h