Merge back earlier cpufreq material.

Conflicts:
	arch/mips/loongson/lemote-2f/clock.c
	drivers/cpufreq/intel_pstate.c
This commit is contained in:
Rafael J. Wysocki 2014-06-03 15:03:27 +02:00
commit 5ece239918
46 changed files with 576 additions and 556 deletions

View file

@ -62,7 +62,7 @@ LIB_MAJ= 0.0.0
LIB_MIN= 0
PACKAGE = cpupower
PACKAGE_BUGREPORT = cpufreq@vger.kernel.org
PACKAGE_BUGREPORT = linux-pm@vger.kernel.org
LANGUAGES = de fr it cs pt

View file

@ -18,7 +18,7 @@
* 5.) if the third value, "diff_pmtmr", changes between 2. and 4., the
* TSC-based delay routine on the Linux kernel does not correctly
* handle the cpufreq transition. Please report this to
* cpufreq@vger.kernel.org
* linux-pm@vger.kernel.org
*/
#include <linux/kernel.h>