git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d844222
3e89c7b
c1e7abb
)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 12 Nov 2008 09:11:37 +0000
(10:11 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 12 Nov 2008 09:11:37 +0000
(10:11 +0100)
Conflicts:
kernel/trace/ring_buffer.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff