Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 03:55:20 +0000 (19:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 03:55:20 +0000 (19:55 -0800)
commit0019fab3558c8c8135c88c3d38f24ab0a5408aa6
treed51fe9edb3e05efe5089e3360510f513cccb6b0b
parentb64c5fda3868cb29d5dae0909561aa7d93fb7330
parent6c8d8b3c69cef1330e0c5cbc2a8b9268024927a0
Merge branch 'x86-asm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 asm changes from Ingo Molnar:
 "Two fixlets and a cleanup."

* 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86_32: Return actual stack when requesting sp from regs
  x86: Don't clobber top of pt_regs in nested NMI
  x86/asm: Clean up copy_page_*() comments and code
arch/x86/include/asm/ptrace.h
arch/x86/kernel/entry_64.S