Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 23:53:14 +0000 (16:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 May 2011 23:53:14 +0000 (16:53 -0700)
commit9720d75399fd2655a6b6fb06abcf548150f22362
treea9c239d322420ad96afda07294d0c53295adcd3e
parent0c63e38a129e7b1f625c6112439a4efc87b1635c
parentd92fcf0552a15891b25c343cee340d295e24109c
Merge branch 'for-2.6.40' of git://git./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