linux-wandboard

Merge branch 'x86/apic' into cpus4096

This done for conflict prevention: we merge it into the cpus4096 tree
because upcoming cpumask changes will touch apic.c that would collide
with x86/apic otherwise.