projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b64c5fd 6c8d8b3)
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)
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

1  2 
arch/x86/include/asm/ptrace.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/entry_64.S patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/ptrace.h
Simple merge
diff --cc arch/x86/kernel/entry_64.S
Simple merge
Unnamed repository; edit this file 'description' to name the repository.