git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0fdc7a8
aef55d4
)
Merge branch 'x86/irq' into x86/apic
author
H. Peter Anvin
<hpa@zytor.com>
Tue, 23 Feb 2010 00:20:34 +0000
(16:20 -0800)
committer
H. Peter Anvin
<hpa@zytor.com>
Tue, 23 Feb 2010 00:20:34 +0000
(16:20 -0800)
Merge reason:
Conflicts in arch/x86/kernel/apic/io_apic.c
Resolved Conflicts:
arch/x86/kernel/apic/io_apic.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff