Merge branch 'pm-sleep'
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Sep 2012 18:25:38 +0000 (20:25 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 17 Sep 2012 18:25:38 +0000 (20:25 +0200)
commitd6a56ae7ac6121ef99500b3380e98f83a3d9e102
tree372217920c4cbbf11eb7e332ddfa54e63eaa9d25
parent079d364b042afbe811c4bb0cb57fcbf4f1cfab6d
parentbbdc18a3fb6740619f0d037241c85dc6cd4517aa
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