diff options
author | 2012-07-11 12:26:40 -0600 | |
---|---|---|
committer | 2012-07-11 12:26:40 -0600 | |
commit | 7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed (patch) | |
tree | f8ce42e62b68b03ae90594830e58390930e8d780 /tools/perf/scripts/python | |
parent | Merge branch 'pci/bjorn-p2p-bridge-windows' into next (diff) | |
parent | PCI: acpiphp: merge acpiphp_debug and debug (diff) | |
download | linux-dev-7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed.tar.xz linux-dev-7569c43e4d3fbb0ef1a8db0db3c1d77111bf26ed.zip |
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
Diffstat (limited to 'tools/perf/scripts/python')
0 files changed, 0 insertions, 0 deletions