]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5de52491a9ae6580014950c09cf0dd5c5171e65d
treef8ce42e62b68b03ae90594830e58390930e8d780
parent0992503c24921cc6af3533cf3cf567313df1f3e1
parent46d51ab47123742915dbaac627b835eab8eac1f4
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