Merge branches 'tracing/hw-branch-tracing' and 'tracing/power-tracer' into tracing/core

Browse source

...

This commit is contained in:

Ingo Molnar 2009-02-17 11:29:53 +01:00

parent a234aa9ecd 72b623c736

commit c4e2b432d5

4 changed files with 119 additions and 84 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c

View file

3

arch/x86/kernel/process.c

View file

25

include/trace/power.h

View file

173

kernel/trace/trace_power.c

View file