git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7ab6af7
796aade
)
Merge branch 'linus' into x86/x2apic
author
Ingo Molnar
<mingo@elte.hu>
Mon, 11 Aug 2008 09:19:20 +0000
(11:19 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 11 Aug 2008 09:19:20 +0000
(11:19 +0200)
Conflicts:
arch/x86/kernel/genapic_64.c
Manual merge:
arch/x86/kernel/genx2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff