summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:38 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2012-09-17 20:25:38 +0200
commitd6a56ae7ac6121ef99500b3380e98f83a3d9e102 (patch)
tree372217920c4cbbf11eb7e332ddfa54e63eaa9d25 /arch
parentMerge branch 'pm-domains' (diff)
parentproperly __init-annotate pm_sysrq_init() (diff)
downloadlinux-d6a56ae7ac6121ef99500b3380e98f83a3d9e102.tar.xz
linux-d6a56ae7ac6121ef99500b3380e98f83a3d9e102.zip
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions