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-09-24 13:31:38 +02:00
2012-08-18 23:40:13 -07:00
2012-05-04 16:33:16 -07:00
2012-07-29 21:24:13 +04:00
2012-03-14 07:44:11 +01:00
2010-05-21 09:37:29 -07:00