From: Rafael J. Wysocki <rjw@rjwysocki.net>
Date: Fri, 25 Oct 2013 20:36:40 +0000 (+0200)
Subject: Merge back earlier 'pm-cpufreq' material.
X-Git-Tag: v3.13-rc1~96^2~12^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ddee424fea2d269c2f402278d93165c7b92dc58;p=pandora-kernel.git

Merge back earlier 'pm-cpufreq' material.

Conflicts:
	drivers/cpufreq/omap-cpufreq.c
---

6ddee424fea2d269c2f402278d93165c7b92dc58
Reading git-diff-tree failed