]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2012 17:39:40 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Jul 2012 17:39:40 +0000 (10:39 -0700)
commita9bfba88b60d415d1a62d48daf2ed6221be8aad0
tree09f0b3e3bfec1d19c7313d49749422b6c8ffdf7c
parentb69b9a5ec67ce934dd5da76443674587ae37a245
parent0037cfac7f44d4ac3ec6a692856b5fb5bc231730
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer fixes from James Morris.

A documentation update, and a nommu build fix.

* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: Fix nommu build.
  security: document no_new_privs