projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
43bd123
0f6ce3d
)
Merge branch 'tracing/ftrace' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 4 Jun 2009 11:59:26 +0000
(13:59 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 4 Jun 2009 11:59:40 +0000
(13:59 +0200)
Merge reason: this mini-topic had outstanding problems that delayed
its merge, so it does not fast-forward.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge