Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2012 00:21:59 +0000 (17:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 8 Jul 2012 00:21:59 +0000 (17:21 -0700)
commita0127afbed65b7b9f8a486c557017eafb4d4c0fc
tree13cc11b0eb15128270e323c4053922d39a7343c7
parent332a2e1244bd08b9e3ecd378028513396a004a24
parentc540521bba5d2f24bd2c0417157bfaf8b85e2eee
Merge branch 'for-linus' of git://git./linux/kernel/git/jmorris/linux-security

Pull security docs update from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security: Minor improvements to no_new_privs documentation