Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 17:11:26 +0000 (10:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Sep 2009 17:11:26 +0000 (10:11 -0700)
commitd19110baaf20d5183689287bdbcf91e26e40cb79
treee4beb421c2bd9e0cd6e9bb75480c1c705c7db102
parent433c24ed7ff378b22c4d6531a4ce1ffc62642395
parentb60e714dc3ef2a2541e3b262b8b742ba08a07fc0
Merge branch 'x86/ptrace-syscall-exit' of git://git./linux/kernel/git/frob/linux-2.6-roland

* 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
  x86: ptrace: sysret path should reach syscall_trace_leave