git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1f91233
d02e30c
)
Merge remote branch 'origin/x86/apic' into x86/mrst
author
H. Peter Anvin
<hpa@zytor.com>
Tue, 23 Feb 2010 00:25:18 +0000
(16:25 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Tue, 23 Feb 2010 00:25:18 +0000
(16:25 -0800)
Conflicts:
arch/x86/kernel/apic/io_apic.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff