tree 13cc11b0eb15128270e323c4053922d39a7343c7
parent 332a2e1244bd08b9e3ecd378028513396a004a24
parent c540521bba5d2f24bd2c0417157bfaf8b85e2eee
author Linus Torvalds <torvalds@linux-foundation.org> 1341706919 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1341706919 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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