| commit | 7113fe74c10bc01abfdad2fe1f9ca023b0f83685 | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Feb 15 13:58:54 2013 +0100 |
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | Fri Feb 15 13:58:54 2013 +0100 |
| tree | 6b301a39850b9d41acb4bf3084dde2f012a5affc | |
| parent | a68d35323b091f51e0957313f0f871f187879143 [diff] | |
| parent | 957d1282bb8c07e682e142b9237cd9fcb8348a0b [diff] |
Merge branch 'pm-assorted' * pm-assorted: suspend: enable freeze timeout configuration through sys ACPI: enable ACPI SCI during suspend PM: Introduce suspend state PM_SUSPEND_FREEZE PM / Runtime: Add new helper function: pm_runtime_active() PM / tracing: remove deprecated power trace API PM: don't use [delayed_]work_pending() PM / Domains: don't use [delayed_]work_pending()