git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5a209c2
86fa2f6
6d5b43a
)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 19 Nov 2008 09:04:25 +0000
(10:04 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 19 Nov 2008 09:04:25 +0000
(10:04 +0100)
Conflicts:
kernel/trace/ftrace.c
[ We conflicted here because we backported a few fixes to
tracing/urgent - which has different internal APIs. ]
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff