git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2930833
10a010f
)
Merge branch 'x86/x2apic' into x86/core
author
Ingo Molnar
<mingo@elte.hu>
Sat, 26 Jul 2008 14:29:23 +0000
(16:29 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Sat, 26 Jul 2008 14:29:23 +0000
(16:29 +0200)
Conflicts:
include/asm-x86/i8259.h
include/asm-x86/msidef.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff