diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:29 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-19 00:03:29 +0200 |
| commit | d52fdf13377c25e7a5620c6bec406bbf6a46d443 (patch) | |
| tree | bbcce588f5753d3174956324c4265c3235611543 /drivers/dma/mpc512x_dma.c | |
| parent | 7791bd230c6fe65348456564743f99fa066f00e7 (diff) | |
| parent | 11388c87d2abca1f01975ced28ce9eacea239104 (diff) | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: Require CAP_BLOCK_SUSPEND to use wake_lock/wake_unlock
PM / Sleep: Add missing static storage class specifiers in main.c
PM / Sleep: Fix build warning in sysfs.c for CONFIG_PM_SLEEP unset
PM / Hibernate: Print hibernation/thaw progress indicator one line at a time.
PM / Sleep: Separate printing suspend times from initcall_debug
PM / Sleep: add knob for printing device resume times
ftrace: Disable function tracing during suspend/resume and hibernation, again
PM / Hibernate: Enable suspend to both for in-kernel hibernation.
Diffstat (limited to 'drivers/dma/mpc512x_dma.c')
0 files changed, 0 insertions, 0 deletions