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: [CPUFREQ] Remove pointless printk from p4-clockmod. [CPUFREQ] Fix section mismatch for powernow_cpu_init in powernow-k7.c [CPUFREQ] Fix section mismatch for longhaul_cpu_init. [CPUFREQ] Fix section mismatch for longrun_cpu_init. [CPUFREQ] powernow-k8: Fix misleading variable naming [CPUFREQ] Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) [CPUFREQ] arch/x86/kernel/cpu/cpufreq: use for_each_pci_dev() [CPUFREQ] fix brace coding style issue. [CPUFREQ] x86 cpufreq: Make trace_power_frequency cpufreq driver independent [CPUFREQ] acpi-cpufreq: Fix CPU_ANY CPUFREQ_{PRE,POST}CHANGE notification [CPUFREQ] ondemand: don't synchronize sample rate unless multiple cpus present [CPUFREQ] unexport (un)lock_policy_rwsem* functions [CPUFREQ] ondemand: Refactor frequency increase code [CPUFREQ] powernow-k8: On load failure, remind the user to enable support in BIOS setup [CPUFREQ] powernow-k8: Limit Pstate transition latency check [CPUFREQ] Fix PCC driver error path [CPUFREQ] fix double freeing in error path of pcc-cpufreq [CPUFREQ] pcc driver should check for pcch method before calling _OSC [CPUFREQ] fix memory leak in cpufreq_add_dev [CPUFREQ] revert "[CPUFREQ] remove rwsem lock from CPUFREQ_GOV_STOP call (second call site)" Manually fix up non-data merge conflict introduced by new calling conventions for trace_power_start() in commit 6f4f2723 ("x86 cpufreq: Make trace_power_frequency cpufreq driver independent"), which didn't update the intel_idle native hardware cpuidle driver.
No related branches found
No related tags found
Showing
- Documentation/feature-removal-schedule.txt 0 additions, 10 deletionsDocumentation/feature-removal-schedule.txt
- arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2 additions, 5 deletionsarch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
- arch/x86/kernel/cpu/cpufreq/gx-suspmod.c 4 additions, 7 deletionsarch/x86/kernel/cpu/cpufreq/gx-suspmod.c
- arch/x86/kernel/cpu/cpufreq/longhaul.c 3 additions, 3 deletionsarch/x86/kernel/cpu/cpufreq/longhaul.c
- arch/x86/kernel/cpu/cpufreq/longhaul.h 13 additions, 13 deletionsarch/x86/kernel/cpu/cpufreq/longhaul.h
- arch/x86/kernel/cpu/cpufreq/longrun.c 3 additions, 3 deletionsarch/x86/kernel/cpu/cpufreq/longrun.c
- arch/x86/kernel/cpu/cpufreq/p4-clockmod.c 1 addition, 6 deletionsarch/x86/kernel/cpu/cpufreq/p4-clockmod.c
- arch/x86/kernel/cpu/cpufreq/powernow-k7.c 4 additions, 4 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k7.c
- arch/x86/kernel/cpu/cpufreq/powernow-k8.c 4 additions, 2 deletionsarch/x86/kernel/cpu/cpufreq/powernow-k8.c
- arch/x86/kernel/process.c 4 additions, 4 deletionsarch/x86/kernel/process.c
- drivers/cpufreq/cpufreq.c 9 additions, 9 deletionsdrivers/cpufreq/cpufreq.c
- drivers/cpufreq/cpufreq_ondemand.c 18 additions, 15 deletionsdrivers/cpufreq/cpufreq_ondemand.c
- drivers/cpuidle/cpuidle.c 1 addition, 1 deletiondrivers/cpuidle/cpuidle.c
- drivers/idle/intel_idle.c 1 addition, 1 deletiondrivers/idle/intel_idle.c
- include/linux/cpufreq.h 0 additions, 5 deletionsinclude/linux/cpufreq.h
- include/trace/events/power.h 15 additions, 12 deletionsinclude/trace/events/power.h
- tools/perf/builtin-timechart.c 6 additions, 5 deletionstools/perf/builtin-timechart.c
Loading
Please register or sign in to comment