From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 17 Sep 2012 18:25:38 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: v3.7-rc1~137^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6a56ae7ac6121ef99500b3380e98f83a3d9e102;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pm-sleep'

* pm-sleep:
  properly __init-annotate pm_sysrq_init()
  PM / wakeup: Use irqsave/irqrestore for events_lock
  PM / Freezer: Fix small typo "regrigerator"
  PM / Sleep: Print name of wakeup source that aborts suspend
---

d6a56ae7ac6121ef99500b3380e98f83a3d9e102