git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1c39194
061e41f
)
Merge branch 'linus' into cpus4096
author
Ingo Molnar
<mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000
(20:09 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 2 Dec 2008 19:09:50 +0000
(20:09 +0100)
Conflicts:
kernel/trace/ring_buffer.c
Trivial merge