aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/handler.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2007-07-19 21:42:40 +0000
committerLinus Torvalds <[email protected]>2007-07-19 21:42:40 +0000
commit721e2629fa2167c0e5a9f10d704b1fee1621a8cb (patch)
treea1580ed191e710f891ef1bf25c8c1fc7d6f054a9 /net/tipc/handler.c
parentMerge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6 (diff)
parentSELinux: use SECINITSID_NETMSG instead of SECINITSID_UNLABELED for NetLabel (diff)
downloadkernel-721e2629fa2167c0e5a9f10d704b1fee1621a8cb.tar.gz
kernel-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/tipc/handler.c')
0 files changed, 0 insertions, 0 deletions