]> Pileus Git - ~andy/linux/commitdiff
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)
* 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


Trivial merge