From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Mon, 24 Sep 2012 11:31:38 +0000 (+0200)
Subject: Merge branch 'pm-sleep'
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~39^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=057d51a1268fe4be039db8ff0791fcfcb63a4f1b;p=pandora-kernel.git

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)
---

057d51a1268fe4be039db8ff0791fcfcb63a4f1b
Reading git-diff-tree failed