git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e3ae0ac
8b7ef4e
)
Merge branch 'x86/fixmap' into x86/devel
author
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000
(12:24 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 8 Jul 2008 10:24:29 +0000
(12:24 +0200)
Conflicts:
arch/x86/mm/init_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge