diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 09:03:27 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-03 09:03:27 -0400 |
| commit | 5ece2399181a5abaf42a4cb607463770686778e6 (patch) | |
| tree | 5c789755fce670511f2ac1bc3eebf39e26ed1724 /tools | |
| parent | bf8102228a8bf053051f311e5486042fe0542894 (diff) | |
| parent | 8d65775d17941d6d41f5913fc6a99a134c588e01 (diff) | |
Merge back earlier cpufreq material.
Conflicts:
arch/mips/loongson/lemote-2f/clock.c
drivers/cpufreq/intel_pstate.c
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/power/cpupower/Makefile | 2 | ||||
| -rw-r--r-- | tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile index cbfec92af327..3651db7eda23 100644 --- a/tools/power/cpupower/Makefile +++ b/tools/power/cpupower/Makefile | |||
| @@ -62,7 +62,7 @@ LIB_MAJ= 0.0.0 | |||
| 62 | LIB_MIN= 0 | 62 | LIB_MIN= 0 |
| 63 | 63 | ||
| 64 | PACKAGE = cpupower | 64 | PACKAGE = cpupower |
| 65 | PACKAGE_BUGREPORT = cpufreq@vger.kernel.org | 65 | PACKAGE_BUGREPORT = linux-pm@vger.kernel.org |
| 66 | LANGUAGES = de fr it cs pt | 66 | LANGUAGES = de fr it cs pt |
| 67 | 67 | ||
| 68 | 68 | ||
diff --git a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c index 0f10b81e3322..5224ee5b392d 100644 --- a/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c +++ b/tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | * 5.) if the third value, "diff_pmtmr", changes between 2. and 4., the | 18 | * 5.) if the third value, "diff_pmtmr", changes between 2. and 4., the |
| 19 | * TSC-based delay routine on the Linux kernel does not correctly | 19 | * TSC-based delay routine on the Linux kernel does not correctly |
| 20 | * handle the cpufreq transition. Please report this to | 20 | * handle the cpufreq transition. Please report this to |
| 21 | * cpufreq@vger.kernel.org | 21 | * linux-pm@vger.kernel.org |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |