tree a911873bb8ec85324e3035254399b2a8bb332029
parent ed21a66c1862499bb21c8e48a450e13fb830f46b
parent 161270fc1f9ddfc17154e0d49291472a9cdef7db
author Linus Torvalds <torvalds@linux-foundation.org> 1339804759 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1339804759 -0700

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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