tree 35198f6fc524976db5465e9bb57cd26c759b67e0
parent 197fe6b0e6843b6859c6a1436ff19e3c444c0502
parent eeeda4cd06e828b331b15741a204ff9f5874d28d
author Linus Torvalds <torvalds@linux-foundation.org> 1413216992 +0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1413216992 +0200

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

Pull x86 bootup updates from Ingo Molnar:
 "The changes in this cycle were:

   - Fix rare SMP-boot hang (mostly in virtual environments)

   - Fix build warning with certain (rare) toolchains"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/relocs: Make per_cpu_load_addr static
  x86/smpboot: Initialize secondary CPU only if master CPU will wait for it