| commit | ff5f149b6aec8edbfa3698721667acd043009a33 | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt <srostedt@redhat.com> | Fri May 21 11:49:57 2010 -0400 |
| committer | Steven Rostedt <rostedt@goodmis.org> | Fri May 21 11:49:57 2010 -0400 |
| tree | d052553eb296dfee3f01b1cb2b717cb7ccf3127a | |
| parent | f0218b3e9974f06014b61be8987159f4a20e011e [diff] | |
| parent | 580d607cd666dfabfc1c7b0fb08c8ac690c7c87f [diff] |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7 Conflicts: include/linux/ftrace_event.h include/trace/ftrace.h kernel/trace/trace_event_perf.c kernel/trace/trace_kprobe.c kernel/trace/trace_syscalls.c Signed-off-by: Steven Rostedt <rostedt@goodmis.org>