| commit | 057d51a1268fe4be039db8ff0791fcfcb63a4f1b | [log] [tgz] |
|---|---|---|
| author | Rafael J. Wysocki <rjw@sisk.pl> | Mon Sep 24 13:31:38 2012 +0200 |
| committer | Rafael J. Wysocki <rjw@sisk.pl> | Mon Sep 24 13:31:38 2012 +0200 |
| tree | 50b7395aa526c5be9f3ae75836b5ad364db04877 | |
| parent | 071f58279f274f749c4109aef86d899766014139 [diff] | |
| parent | 88d26136a256576e444db312179e17af6dd0ea87 [diff] |
Merge branch 'pm-sleep' * pm-sleep: PM: Prevent runtime suspend during system resume PM / Sleep: use resume event when call dpm_resume_early Conflicts: drivers/base/power/main.c (trivial)