projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
31b7a57
3dbbbe0
)
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 11 Jul 2015 17:38:10 +0000
(10:38 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 11 Jul 2015 17:38:10 +0000
(10:38 -0700)
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
Trivial merge