git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
8f8ffe2
)
Merge commit 'tracing/core' into tracing/kprobes
author
Frederic Weisbecker
<fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000
(
01:09
+0200)
committer
Frederic Weisbecker
<fweisbec@gmail.com>
Thu, 10 Sep 2009 23:09:23 +0000
(
01:09
+0200)
Conflicts:
kernel/trace/trace_export.c
kernel/trace/trace_kprobe.c
Merge reason: This topic branch lacks an important
build fix in tracing/core:
0dd7b74787eaf7858c6c573353a83c3e2766e674
:
tracing: Fix double CPP substitution in TRACE_EVENT_FN
that prevents from multiple tracepoint headers inclusion crashes.
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
No differences found