git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
843adf2
4377245
)
Merge branch 'tip/x86/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
author
Ingo Molnar
<mingo@elte.hu>
Sun, 22 Feb 2009 17:12:01 +0000
(18:12 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 22 Feb 2009 17:12:01 +0000
(18:12 +0100)
Conflicts:
include/linux/ftrace.h
kernel/trace/ftrace.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff