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)
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


Trivial merge