From: Linus Torvalds <torvalds@linux-foundation.org>
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: MMI-PSA29.97-13-9~16152
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c8dfbf48d3dd4e96044f2fa04fb5f58239e44c31;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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