tree bbcce588f5753d3174956324c4265c3235611543
parent 7791bd230c6fe65348456564743f99fa066f00e7
parent 11388c87d2abca1f01975ced28ce9eacea239104
author Rafael J. Wysocki <rjw@sisk.pl> 1342649009 +0200
committer Rafael J. Wysocki <rjw@sisk.pl> 1342649009 +0200

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.