OSDN Git Service

Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 11 Jul 2015 17:38:10 +0000 (10:38 -0700)
committerLinus 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