projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 071f582 88d2613)
Merge branch 'pm-sleep'
authorRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 11:31:38 +0000 (13:31 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Mon, 24 Sep 2012 11:31:38 +0000 (13:31 +0200)
commit057d51a1268fe4be039db8ff0791fcfcb63a4f1b
tree50b7395aa526c5be9f3ae75836b5ad364db04877tree | snapshot
parent071f58279f274f749c4109aef86d899766014139commit | diff
parent88d26136a256576e444db312179e17af6dd0ea87commit | 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)
drivers/base/power/main.c diff1 | diff2 | blob | history
drivers/pci/pci-driver.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.