git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a309720
45b86a9
)
Merge branch 'tracing/urgent' into tracing/ftrace
author
Ingo Molnar
<mingo@elte.hu>
Tue, 11 Nov 2008 08:40:18 +0000
(09:40 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 11 Nov 2008 08:40:18 +0000
(09:40 +0100)
Conflicts:
kernel/trace/trace.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff