diff options
author | Linus Torvalds | 2007-07-19 23:42:40 +0200 |
---|---|---|
committer | Linus Torvalds | 2007-07-19 23:42:40 +0200 |
commit | 721e2629fa2167c0e5a9f10d704b1fee1621a8cb (patch) | |
tree | a1580ed191e710f891ef1bf25c8c1fc7d6f054a9 /net/ipv4 | |
parent | Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff) | |
parent | SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel (diff) | |
download | kernel-qcow2-linux-721e2629fa2167c0e5a9f10d704b1fee1621a8cb.tar.gz kernel-qcow2-linux-721e2629fa2167c0e5a9f10d704b1fee1621a8cb.tar.xz kernel-qcow2-linux-721e2629fa2167c0e5a9f10d704b1fee1621a8cb.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel
SELinux: enable dynamic activation/deactivation of NetLabel/SELinux enforcement
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions