git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c71dd42
6d102bc
3d9101e
)
Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' into...
author
Ingo Molnar
<mingo@elte.hu>
Fri, 19 Dec 2008 08:42:40 +0000
(09:42 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 19 Dec 2008 08:42:40 +0000
(09:42 +0100)
Conflicts:
include/linux/ftrace.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff