Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

Browse source

...

This commit is contained in:

Ingo Molnar 2011-06-08 16:09:55 +02:00

parent 86dd7909c2 a4f18ed11a

commit 5cf42f7055

2 changed files with 14 additions and 3 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

9

kernel/trace/ftrace.c

View file

8

kernel/trace/trace_kprobe.c

View file