summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 16:53:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-25 16:53:14 -0700
commit9720d75399fd2655a6b6fb06abcf548150f22362 (patch)
treea9c239d322420ad96afda07294d0c53295adcd3e /scripts
parent0c63e38a129e7b1f625c6112439a4efc87b1635c (diff)
parentd92fcf0552a15891b25c343cee340d295e24109c (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
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions