Rafael J. Wysocki
057d51a126
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)
2012-09-24 13:31:38 +02:00
..
2012-08-08 20:49:33 +02:00
2012-09-04 01:36:05 +02:00
2012-05-11 21:11:44 +02:00
2012-09-06 23:10:53 +02:00
2012-01-29 20:38:41 +01:00
2012-09-24 13:31:38 +02:00
2011-12-01 21:47:40 +01:00
2012-09-09 22:06:33 +02:00
2012-09-04 01:36:03 +02:00
2012-09-19 14:17:20 +02:00
2012-09-22 21:15:08 +02:00
2012-07-12 22:40:02 +02:00
2011-10-31 19:31:38 -04:00
2012-09-06 23:19:06 +02:00