git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90edf27
c79bd89
)
Merge branch 'linus' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 23 Sep 2010 06:02:09 +0000
(08:02 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 23 Sep 2010 06:02:09 +0000
(08:02 +0200)
Conflicts:
arch/sparc/kernel/perf_event.c
Merge reason: Resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff