]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
projects / thirdparty / kernel / stable.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1eaa478 9d192e1)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
authorSteven Rostedt <srostedt@redhat.com>
Tue, 18 May 2010 02:26:53 +0000 (22:26 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 18 May 2010 04:35:23 +0000 (00:35 -0400)
commitf0218b3e9974f06014b61be8987159f4a20e011e
tree29a593c4d71ab18cb0c450a34e79bf6bea66877etree | snapshot
parent1eaa4787a774c4896518c81f24e8bccaa2244924commit | diff
parent9d192e118a094087494997ea1c8a2faf39af38c5commit | 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>
include/linux/ftrace.h diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
include/trace/ftrace.h diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history
kernel/trace/trace_events_filter.c diff1 | diff2 | blob | history
kernel/trace/trace_kprobe.c diff1 | diff2 | blob | history
kernel/trace/trace_selftest.c diff1 | diff2 | blob | history
Mirror https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git