diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:38 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-17 20:25:38 +0200 |
| commit | d6a56ae7ac6121ef99500b3380e98f83a3d9e102 (patch) | |
| tree | 372217920c4cbbf11eb7e332ddfa54e63eaa9d25 /kernel/power/block_io.c | |
| parent | 079d364b042afbe811c4bb0cb57fcbf4f1cfab6d (diff) | |
| parent | bbdc18a3fb6740619f0d037241c85dc6cd4517aa (diff) | |
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 'kernel/power/block_io.c')
0 files changed, 0 insertions, 0 deletions