Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 init code fixlet from Ingo Molnar:
 "A single change: fix obsolete init code annotations"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Drop bogus __ref / __refdata annotations

diff --cc arch/x86/kernel/apic/x2apic_cluster.c
Simple merge

diff --cc arch/x86/kernel/cpu/microcode/core.c
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge