projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b9974dc
a98f8fd
)
Merge branch 'x86/apic' into cpus4096
author
Ingo Molnar
<mingo@elte.hu>
Thu, 18 Dec 2008 10:55:06 +0000
(11:55 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 18 Dec 2008 10:55:12 +0000
(11:55 +0100)
This done for conflict prevention: we merge it into the cpus4096 tree
because upcoming cpumask changes will touch apic.c that would collide
with x86/apic otherwise.
1
2
arch/x86/kernel/apic.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/kernel/apic.c
Simple merge