Merge branch 'x86/cpufeature' into irq/numa

Merge reason: irq/numa didnt build because this commit:

  2759c328

: 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>