git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository