From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jul 2012 17:39:40 +0000 (-0700)
Subject: Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=3bfd245476eca2f8375249f3a1e7a60d3c754f47;p=linux-edison.git

Merge branch 'for-linus2' of git://git./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
---

3bfd245476eca2f8375249f3a1e7a60d3c754f47