From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 18 Jul 2012 22:03:29 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d52fdf13377c25e7a5620c6bec406bbf6a46d443;p=linux-beck.git

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.
---

d52fdf13377c25e7a5620c6bec406bbf6a46d443