diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 22:29:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 22:30:01 +0200 |
| commit | ee4c24a5c9b530481394132c8dbc10572d57c075 (patch) | |
| tree | 91c580724b9de9f2ae09bb375fc33f4df24b55c0 /arch/x86/kernel/apic/apic.c | |
| parent | Merge branch 'linus' into irq/numa (diff) | |
| parent | x86: clean up and fix setup_clear/force_cpu_cap handling (diff) | |
| download | linux-ee4c24a5c9b530481394132c8dbc10572d57c075.tar.xz linux-ee4c24a5c9b530481394132c8dbc10572d57c075.zip | |
Merge branch 'x86/cpufeature' into irq/numa
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>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
0 files changed, 0 insertions, 0 deletions