]> 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)
commit14d82a29f29ad1399729a4c1ae5654014abbf9af
tree09f0b3e3bfec1d19c7313d49749422b6c8ffdf7c
parent11f5c24dc305839472de8f01c60b9159f87cd17e
parentd68ffde3b4be49aa829d1f13200015d4b93d8a3a
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