Merge branch 'pci/yinghai-hotplug-cleanup' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 11 Jul 2012 18:26:40 +0000 (12:26 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 11 Jul 2012 18:26:40 +0000 (12:26 -0600)
* pci/yinghai-hotplug-cleanup:
  PCI: acpiphp: merge acpiphp_debug and debug
  PCI: acpiphp: remove unused res_lock

1  2 
drivers/pci/hotplug/acpiphp_glue.c

Simple merge