diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-01 16:29:35 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-01 16:30:01 -0400 |
| commit | ee4c24a5c9b530481394132c8dbc10572d57c075 (patch) | |
| tree | 91c580724b9de9f2ae09bb375fc33f4df24b55c0 /kernel | |
| parent | 3d58f48ba05caed9118bce62b3047f8683438835 (diff) | |
| parent | 3e0c373749d7eb5b354ac0b043f2b2cdf84eefef (diff) | |
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 'kernel')
0 files changed, 0 insertions, 0 deletions