diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:54 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-03-20 13:25:54 +0100 |
| commit | 36cc86e8ec1a0ab309052bc9b25e48a31288b8a5 (patch) | |
| tree | a086963951243babaad7d1cc874e015864a2b045 /drivers/base | |
| parent | 165f5fd04aa898fa7dbe4fbe2819cf80453d3bb9 (diff) | |
| parent | 651665dbfdfca3201966c72edefdb0391160bea9 (diff) | |
| parent | 33fe0ad946bbb0a2f04f551fce68a74d8821f32e (diff) | |
| download | linux-36cc86e8ec1a0ab309052bc9b25e48a31288b8a5.tar.bz2 | |
Merge branches 'pm-runtime' and 'pm-sleep'
* pm-runtime:
PM / Runtime: Update runtime_idle() documentation for return value meaning
* pm-sleep:
PM / sleep: Correct whitespace errors in <linux/pm.h>
PM: Add missing "freeze" state
PM / Hibernate: Spelling s/anonymouns/anonymous/
PM / Runtime: Add missing "it" in comment
PM / suspend: Remove unnecessary !!
PCI / PM: Resume runtime-suspended devices later during system suspend
ACPI / PM: Resume runtime-suspended devices later during system suspend
PM / sleep: Set pm_generic functions to NULL for !CONFIG_PM_SLEEP
PM: fix typo in comment
PM / hibernate: use name_to_dev_t to parse resume
PM / wakeup: Include appropriate header file in kernel/power/wakelock.c
PM / sleep: Move prototype declaration to header file kernel/power/power.h
PM / sleep: Asynchronous threads for suspend_late
PM / sleep: Asynchronous threads for suspend_noirq
PM / sleep: Asynchronous threads for resume_early
PM / sleep: Asynchronous threads for resume_noirq
PM / sleep: Two flags for async suspend_noirq and suspend_late