• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq · ada19a31
    Linus Torvalds authored
    * '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.
      ...
    ada19a31
p4-clockmod.c 8.43 KB