git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
071f582
88d2613
)
Merge branch 'pm-sleep'
author
Rafael J. Wysocki
<rjw@sisk.pl>
Mon, 24 Sep 2012 11:31:38 +0000
(13:31 +0200)
committer
Rafael J. Wysocki
<rjw@sisk.pl>
Mon, 24 Sep 2012 11:31:38 +0000
(13:31 +0200)
* 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)
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff