From: Linus Torvalds Date: Wed, 25 May 2011 23:53:14 +0000 (-0700) Subject: Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc X-Git-Tag: firefly_0821_release~7613^2~1140 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9720d75399fd2655a6b6fb06abcf548150f22362;p=firefly-linux-kernel-4.4.55.git 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 --- 9720d75399fd2655a6b6fb06abcf548150f22362