| commit | 3bfd245476eca2f8375249f3a1e7a60d3c754f47 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 03 10:39:40 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 03 10:39:40 2012 -0700 |
| tree | 09f0b3e3bfec1d19c7313d49749422b6c8ffdf7c | |
| parent | 9d4056aa9efa07015aa6da11ae2e72f22dc55c97 [diff] | |
| parent | 75331a597cf4cde51d9b0bb22cbd03b9837ef9e4 [diff] |
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