git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d040c16
54321d9
)
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy...
author
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 12:09:00 +0000
(13:09 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 13 Feb 2009 12:09:00 +0000
(13:09 +0100)
Conflicts:
arch/x86/include/asm/page.h
arch/x86/include/asm/pgtable.h
arch/x86/mach-voyager/voyager_smp.c
arch/x86/mm/fault.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff