git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f0218b3
580d607
)
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
author
Steven Rostedt
<srostedt@redhat.com>
Fri, 21 May 2010 15:49:57 +0000
(11:49 -0400)
committer
Steven Rostedt
<rostedt@goodmis.org>
Fri, 21 May 2010 15:49:57 +0000
(11:49 -0400)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff