From: Ingo Molnar Date: Mon, 1 Jun 2009 20:29:35 +0000 (+0200) Subject: Merge branch 'x86/cpufeature' into irq/numa X-Git-Tag: firefly_0821_release~14013^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee4c24a5c9b530481394132c8dbc10572d57c075;p=firefly-linux-kernel-4.4.55.git 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 --- ee4c24a5c9b530481394132c8dbc10572d57c075