| commit | 2278cb0bb3a177d3a3ef0bd332916180cb2f2121 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 11 10:38:10 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 11 10:38:10 2015 -0700 |
| tree | 8c2ded2376de8aaa9640ca74c07653508064e097 | |
| parent | 31b7a57c9eb3d90c87b6c2b855720ec709d2f6be [diff] | |
| parent | 3dbbbe0eb6e949409d215f660cfad782aa541a4b [diff] |
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security Pull selinux fixes from James Morris. * 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selinux: fix mprotect PROT_EXEC regression caused by mm change selinux: don't waste ebitmap space when importing NetLabel categories