projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3d58f48
3e0c373
)
Merge branch 'x86/cpufeature' into irq/numa
author
Ingo Molnar
<mingo@elte.hu>
Mon, 1 Jun 2009 20:29:35 +0000
(22:29 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 1 Jun 2009 20:30:01 +0000
(22:30 +0200)
Merge reason: irq/numa didnt build because this commit:
2759c32
: x86: don't call read_apic_id if !cpu_has_apic
Had a dependency on x86/cpufeature changes. Pull in that
(small) branch to fix the dependency.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
1
2
arch/x86/kernel/cpu/common.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/kernel/cpu/common.c
Simple merge