From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 13 Jun 2012 23:04:51 +0000 (-0600)
Subject: Merge branch 'topic/bjorn-remove-unused' into next
X-Git-Tag: v3.6-rc1~112^2~19
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=10c480933d0ad2ea27630cbaa723a5d33dbece00;p=linux.git

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)
---

10c480933d0ad2ea27630cbaa723a5d33dbece00