]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ee53f4 2ac45f2)
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 patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/hotplug/acpiphp_glue.c
Simple merge
local clone of linux.git