diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-05 16:59:53 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-05 16:59:53 -0700 |
| commit | 3cba8eedb757590455b03dfeaba15a5b32610339 (patch) | |
| tree | 9c035788cf5a2f5fcf897f3fe63c32064bdef255 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Linux 3.7-rc3 (diff) | |
| parent | PCI/PM: Fix proc config reg access for D3cold and bridge suspending (diff) | |
| download | linux-3cba8eedb757590455b03dfeaba15a5b32610339.tar.gz linux-3cba8eedb757590455b03dfeaba15a5b32610339.zip | |
Merge branch 'pci/huang-d3cold-fixes' into for-linus
* pci/huang-d3cold-fixes:
PCI/PM: Fix proc config reg access for D3cold and bridge suspending
PCI/PM: Resume device before shutdown
PCI/PM: Fix deadlock when unbinding device if parent in D3cold
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions