git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a68d353
957d128
)
Merge branch 'pm-assorted'
author
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 15 Feb 2013 12:58:54 +0000
(13:58 +0100)
committer
Rafael J. Wysocki
<rafael.j.wysocki@intel.com>
Fri, 15 Feb 2013 12:58:54 +0000
(13:58 +0100)
* 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()
Trivial merge