git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f254f39
dd4124a
)
Merge branch 'x86/urgent' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Mar 2009 20:48:31 +0000
(21:48 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 5 Mar 2009 20:48:50 +0000
(21:48 +0100)
Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff