projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c7cc773
4f5a7f4
)
Merge branch 'tracing/urgent' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000
(09:20 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 2 Dec 2008 08:20:29 +0000
(09:20 +0100)
Conflicts:
kernel/trace/ring_buffer.c
Trivial merge