diff options
author | 2010-04-24 11:35:21 -0700 | |
---|---|---|
committer | 2010-04-24 11:35:21 -0700 | |
commit | ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e (patch) | |
tree | e28d67d3872dce2516c039ccad08fabff076cead /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
parent | [CPUFREQ] use max load in conservative governor (diff) | |
download | linux-dev-ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e.tar.xz linux-dev-ddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e.zip |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
[CPUFREQ] use max load in conservative governor
[CPUFREQ] fix a lockdep warning
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions