git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ef1f87a
770824b
)
Merge branch 'linus' into x86/apic
author
Ingo Molnar
<mingo@elte.hu>
Sun, 22 Feb 2009 19:05:19 +0000
(20:05 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Sun, 22 Feb 2009 19:05:19 +0000
(20:05 +0100)
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff