diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-14 18:13:50 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-14 18:13:50 -0500 |
commit | dea553e3fc63c5e53a3f8741f0c9f840660cf06e (patch) | |
tree | 3f87bc48f50c318f248934e74de8206a8597480f /drivers/pci/pci.c | |
parent | 77b67063bb6bce6d475e910d3b886a606d0d91f7 (diff) | |
parent | 7e4d68443a80574392d1027ff34992ab945934a6 (diff) |
Merge branch 'pm-qos' into acpi-dev-pm
Material in the 'acpi-dev-pm' branch depends on 'pm-qos' commits.
Diffstat (limited to 'drivers/pci/pci.c')
0 files changed, 0 insertions, 0 deletions