git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
37bd824
ba95fd4
)
Merge branch 'linus' into tracing/blktrace
author
Ingo Molnar
<mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000
(09:00 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 19 Feb 2009 08:00:35 +0000
(09:00 +0100)
Conflicts:
block/blktrace.c
Semantic merge:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge