Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:36:13 +0000 (21:36 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 12 Aug 2012 18:36:13 +0000 (21:36 +0300)
commitc8dfbf48d3dd4e96044f2fa04fb5f58239e44c31
tree822ae29c1572f7e95fd4726c3effd8389a79b336
parente4e139bebd9cc2c867950ad8ea6814e542dbcc6f
parent9d8dad742ad1c74d7e7210ee05d0b44961d5ea16
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