Paul Moore 98f700f317 Merge git://git.infradead.org/users/eparis/selinux ... Conflicts: security/selinux/hooks.c Pull Eric's existing SELinux tree as there are a number of patches in there that are not yet upstream. There was some minor fixup needed to resolve a conflict in security/selinux/hooks.c:selinux_set_mnt_opts() between the labeled NFS patches and Eric's security_fs_use() simplification patch.		2013-09-18 13:52:20 -04:00
..
audit.h
avc_ss.h
avc.h	SELinux: avc: remove the useless fields in avc_add_callback	2012-04-09 12:23:44 -04:00
classmap.h	selinux: add the "attach_queue" permission to the "tun_socket" class	2013-01-14 18:16:59 -05:00
conditional.h
initial_sid_to_string.h
netif.h
netlabel.h
netnode.h
netport.h
objsec.h	SELinux: change sbsec->behavior to short	2013-07-25 13:03:09 -04:00
security.h	Merge git://git.infradead.org/users/eparis/selinux	2013-09-18 13:52:20 -04:00
xfrm.h	selinux: remove the BUG_ON() from selinux_skb_xfrm_sid()	2013-07-25 13:02:13 -04:00