diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-05-19 19:25:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-05-19 19:25:55 +0200 |
commit | 398995ce7980b03b5803f8f31073b45d87746bc1 (patch) | |
tree | 767d0e9d32f177c4c186d5e64210b3587ffff79a /kernel/trace/trace.h | |
parent | c3305257cd4df63e03e21e331a0140ae9c0faccc (diff) | |
parent | d6971822c288ce5547190c6f812cc978d6520777 (diff) |
Merge branch 'tip/perf/core-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace.h')
0 files changed, 0 insertions, 0 deletions