git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
56396e6
521cb40
)
Merge commit 'v2.6.38' into x86/mm
author
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Mar 2011 07:29:44 +0000
(08:29 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 15 Mar 2011 07:29:44 +0000
(08:29 +0100)
Conflicts:
arch/x86/mm/numa_64.c
Merge reason: Resolve the conflict, update the branch to .38.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff