git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
595c364
012abee
)
Merge commit 'v2.6.32-rc5' into perf/probes
author
Ingo Molnar
<mingo@elte.hu>
Sat, 17 Oct 2009 07:58:25 +0000
(09:58 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 17 Oct 2009 07:58:25 +0000
(09:58 +0200)
Conflicts:
kernel/trace/trace_event_profile.c
Merge reason: update to -rc5 and resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff