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-06-13 15:42:25 -06:00
2012-09-24 13:31:38 +02:00
2012-07-24 16:17:07 -07:00
2009-07-12 12:22:34 -07:00
2012-04-06 17:54:53 -07:00