tree d58f35c83a831b1b15c6cac8f07af6fe9d27924e
parent 3a88fe3b748b5bcf1c2c739ad63dab8364fd5b9b
parent ea7bdc65bca8cf837a63e0ff7b75daed83222511
author Linus Torvalds <torvalds@linux-foundation.org> 1396292325 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396292325 -0700

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

Pull x86 apic changes from Ingo Molnar:
 "An xAPIC CPU hotplug race fix, plus cleanups and minor fixes"

* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Plug racy xAPIC access of CPU hotplug code
  x86/apic: Always define nox2apic and define it as initdata
  x86/apic: Remove unused function prototypes
  x86/apic: Switch wait_for_init_deassert() to a bool flag
  x86/apic: Only use default_wait_for_init_deassert()