git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d7aa9d
b419148
)
Merge commit 'v2.6.32-rc6' into perf/core
author
Ingo Molnar
<mingo@elte.hu>
Wed, 4 Nov 2009 10:54:15 +0000
(11:54 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Wed, 4 Nov 2009 10:59:45 +0000
(11:59 +0100)
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff