projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 31b7a57 3dbbbe0)
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)
commit2278cb0bb3a177d3a3ef0bd332916180cb2f2121
tree8c2ded2376de8aaa9640ca74c07653508064e097tree | snapshot (tar.gz zip)
parent31b7a57c9eb3d90c87b6c2b855720ec709d2f6becommit | diff
parent3dbbbe0eb6e949409d215f660cfad782aa541a4bcommit | diff
Merge branch 'for-linus2' of git://git./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
Motorola kernel-slsi