| commit | f0218b3e9974f06014b61be8987159f4a20e011e | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt <srostedt@redhat.com> | Mon May 17 22:26:53 2010 -0400 |
| committer | Steven Rostedt <rostedt@goodmis.org> | Tue May 18 00:35:23 2010 -0400 |
| tree | 29a593c4d71ab18cb0c450a34e79bf6bea66877e | |
| parent | 1eaa4787a774c4896518c81f24e8bccaa2244924 [diff] | |
| parent | 9d192e118a094087494997ea1c8a2faf39af38c5 [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-6 Conflicts: include/trace/ftrace.h kernel/trace/trace_kprobe.c Acked-by: Masami Hiramatsu <mhiramat@redhat.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>