OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5fb896a
f9aa28a
)
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000
(20:08 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 15 Feb 2009 19:08:55 +0000
(20:08 +0100)
Conflicts:
kernel/trace/trace_mmiotrace.c
Trivial merge