From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Jul 2015 17:38:10 +0000 (-0700)
Subject: Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris... 
X-Git-Tag: v4.2-rc2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2278cb0bb3a177d3a3ef0bd332916180cb2f2121;p=thirdparty%2Flinux.git

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
---

2278cb0bb3a177d3a3ef0bd332916180cb2f2121