| commit | 9720d75399fd2655a6b6fb06abcf548150f22362 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 25 16:53:14 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 25 16:53:14 2011 -0700 |
| tree | a9c239d322420ad96afda07294d0c53295adcd3e | |
| parent | 0c63e38a129e7b1f625c6112439a4efc87b1635c [diff] | |
| parent | d92fcf0552a15891b25c343cee340d295e24109c [diff] |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc * 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc: signal: sys_pause() should check signal_pending() ptrace: ptrace_resume() shouldn't wake up !TASK_TRACED thread