Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: (35 commits) [CPUFREQ] Prevent p4-clockmod from auto-binding to the ondemand governor. [CPUFREQ] Make cpufreq-nforce2 less obnoxious [CPUFREQ] p4-clockmod reports wrong frequency. [CPUFREQ] powernow-k8: Use a common exit path. [CPUFREQ] Change link order of x86 cpufreq modules [CPUFREQ] conservative: remove 10x from def_sampling_rate [CPUFREQ] conservative: fixup governor to function more like ondemand logic [CPUFREQ] conservative: fix dbs_cpufreq_notifier so freq is not locked [CPUFREQ] conservative: amend author's email address [CPUFREQ] Use swap() in longhaul.c [CPUFREQ] checkpatch cleanups for acpi-cpufreq [CPUFREQ] powernow-k8: Only print error message once, not per core. [CPUFREQ] ondemand/conservative: sanitize sampling_rate restrictions [CPUFREQ] ondemand/conservative: deprecate sampling_rate{min,max} [CPUFREQ] powernow-k8: Always compile powernow-k8 driver with ACPI support [CPUFREQ] Introduce /sys/devices/system/cpu/cpu*/cpufreq/cpuinfo_transition_latency [CPUFREQ] checkpatch cleanups for powernow-k8 [CPUFREQ] checkpatch cleanups for ondemand governor. [CPUFREQ] checkpatch cleanups for powernow-k7 [CPUFREQ] checkpatch cleanups for speedstep related drivers. ...
Showing
- Documentation/cpu-freq/governors.txt 22 additions, 4 deletionsDocumentation/cpu-freq/governors.txt
- Documentation/cpu-freq/user-guide.txt 12 additions, 0 deletionsDocumentation/cpu-freq/user-guide.txt
- arch/x86/include/asm/timer.h 1 addition, 1 deletionarch/x86/include/asm/timer.h
- arch/x86/kernel/cpu/cpufreq/Kconfig 2 additions, 17 deletionsarch/x86/kernel/cpu/cpufreq/Kconfig
- arch/x86/kernel/cpu/cpufreq/Makefile 6 additions, 2 deletionsarch/x86/kernel/cpu/cpufreq/Makefile
- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 18 additions, 18 deletionsarch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
- arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c 29 additions, 25 deletionsarch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c
- arch/x86/kernel/cpu/cpufreq/e_powersaver.c 12 additions, 9 deletionsarch/x86/kernel/cpu/cpufreq/e_powersaver.c
- arch/x86/kernel/cpu/cpufreq/elanfreq.c 4 additions, 2 deletionsarch/x86/kernel/cpu/cpufreq/elanfreq.c
- arch/x86/kernel/cpu/cpufreq/gx-suspmod.c 65 additions, 40 deletionsarch/x86/kernel/cpu/cpufreq/gx-suspmod.c
- arch/x86/kernel/cpu/cpufreq/longhaul.c 98 additions, 95 deletionsarch/x86/kernel/cpu/cpufreq/longhaul.c
- arch/x86/kernel/cpu/cpufreq/longhaul.h 6 additions, 6 deletionsarch/x86/kernel/cpu/cpufreq/longhaul.h
- arch/x86/kernel/cpu/cpufreq/longrun.c 14 additions, 11 deletionsarch/x86/kernel/cpu/cpufreq/longrun.c
- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c 45 additions, 27 deletionsarch/x86/kernel/cpu/cpufreq/p4-clockmod.c
- arch/x86/kernel/cpu/cpufreq/powernow-k6.c 26 additions, 18 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k6.c
- arch/x86/kernel/cpu/cpufreq/powernow-k7.c 138 additions, 101 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k7.c
- arch/x86/kernel/cpu/cpufreq/powernow-k8.c 233 additions, 153 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k8.c
- arch/x86/kernel/cpu/cpufreq/powernow-k8.h 1 addition, 4 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k8.h
- arch/x86/kernel/cpu/cpufreq/sc520_freq.c 17 additions, 13 deletionsarch/x86/kernel/cpu/cpufreq/sc520_freq.c
- arch/x86/kernel/cpu/cpufreq/speedstep-ich.c 37 additions, 33 deletionsarch/x86/kernel/cpu/cpufreq/speedstep-ich.c
Loading
Please register or sign in to comment