tree a9c239d322420ad96afda07294d0c53295adcd3e
parent 0c63e38a129e7b1f625c6112439a4efc87b1635c
parent d92fcf0552a15891b25c343cee340d295e24109c
author Linus Torvalds <torvalds@linux-foundation.org> 1306367594 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1306367594 -0700

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