commit 6f5621cb160fada5bc52c2961ddc86e69e478912
author Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 28 10:59:44 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sun Feb 28 10:59:44 2010 -0800
tree 921577f89b2bbc69813eabfd21ceedb4d7200133
parent c7e15899d07c9813c1aa96b21699d2d9c8314c4b
parent 6dbbe14f21368a45aedba7eab0221857b8ad8d16

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

* 'x86-ptrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, ptrace: Remove set_stopped_child_used_math() in [x]fpregs_set
  x86, ptrace: Simplify xstateregs_get()
  ptrace: Fix ptrace_regset() comments and diagnose errors specifically
  parisc: Disable CONFIG_HAVE_ARCH_TRACEHOOK
  ptrace: Add support for generic PTRACE_GETREGSET/PTRACE_SETREGSET
  x86, ptrace: regset extensions to support xstate