Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jun 2012 23:59:19 +0000 (16:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jun 2012 23:59:19 +0000 (16:59 -0700)
commitc83119a980166539bc14033d89e83cd2e4f2da52
treea911873bb8ec85324e3035254399b2a8bb332029
parented21a66c1862499bb21c8e48a450e13fb830f46b
parent161270fc1f9ddfc17154e0d49291472a9cdef7db
Merge branch 'x86-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/smp: Fix topology checks on AMD MCM CPUs
  x86/mm: Fix some kernel-doc warnings
  x86, um: Correct syscall table type attributes breaking gcc 4.8
arch/x86/kernel/smpboot.c