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)
commit7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed
treef8ce42e62b68b03ae90594830e58390930e8d780
parent6ee53f4c38e70ba34777ad38807a50c1812ff36f
parent2ac45f28b8eeef576c48579833b40b572f3f9790
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
drivers/pci/hotplug/acpiphp_glue.c
This page took 0.025522 seconds and 5 git commands to generate.