From: Linus Torvalds Date: Sun, 12 Aug 2012 18:36:13 +0000 (+0300) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... X-Git-Tag: v3.6-rc2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31;p=platform%2Fkernel%2Flinux-3.10.git Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security Pull a security subsystem fix from James Morris "This fixes an issue in the Yama LSM" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Yama: higher restrictions should block PTRACE_TRACEME --- c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31