From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 31 Mar 2014 18:58:45 +0000 (-0700)
Subject: Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.15-rc1~178
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=6ed7705167dd056c61b1954fe1366fcddb5bda98;p=linux-2.6-block.git

Merge branch 'x86-apic-for-linus' of git://git./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()
---

6ed7705167dd056c61b1954fe1366fcddb5bda98