git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
774ea0b
2bfc96a
)
Merge commit 'v2.6.36-rc3' into x86/memblock
author
Ingo Molnar
<mingo@elte.hu>
Tue, 31 Aug 2010 07:45:21 +0000
(09:45 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 31 Aug 2010 07:45:46 +0000
(09:45 +0200)
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff