| commit | d19110baaf20d5183689287bdbcf91e26e40cb79 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 23 10:11:26 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Sep 23 10:11:26 2009 -0700 |
| tree | e4beb421c2bd9e0cd6e9bb75480c1c705c7db102 | |
| parent | 433c24ed7ff378b22c4d6531a4ce1ffc62642395 [diff] | |
| parent | b60e714dc3ef2a2541e3b262b8b742ba08a07fc0 [diff] |
Merge branch 'x86/ptrace-syscall-exit' of git://git.kernel.org/pub/scm/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