From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 3 Jun 2014 13:03:27 +0000 (+0200)
Subject: Merge back earlier cpufreq material.
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~39^2~5^2~1^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ece2399181a5abaf42a4cb607463770686778e6;p=pandora-kernel.git

Merge back earlier cpufreq material.

Conflicts:
	arch/mips/loongson/lemote-2f/clock.c
	drivers/cpufreq/intel_pstate.c
---

5ece2399181a5abaf42a4cb607463770686778e6
Reading git-diff-tree failed