From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 11 Jul 2012 18:26:40 +0000 (-0600)
Subject: Merge branch 'pci/yinghai-hotplug-cleanup' into next
X-Git-Tag: v3.6-rc1~112^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed;p=~emulex%2Finfiniband.git

Merge branch 'pci/yinghai-hotplug-cleanup' into next

* pci/yinghai-hotplug-cleanup:
  PCI: acpiphp: merge acpiphp_debug and debug
  PCI: acpiphp: remove unused res_lock
---

7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed