git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb82ad7
85dfd81
)
Merge branch 'linus' into tracing/core
author
Ingo Molnar
<mingo@elte.hu>
Tue, 11 Aug 2009 12:19:09 +0000
(14:19 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 11 Aug 2009 12:19:09 +0000
(14:19 +0200)
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff