James Morris b7b57551bb Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus ... Conflicts: lib/flex_array.c security/selinux/avc.c security/selinux/hooks.c security/selinux/ss/policydb.c security/smack/smack_lsm.c Manually resolve conflicts. Signed-off-by: James Morris <jmorris@namei.org>		2011-05-24 23:20:19 +10:00
..
audit.h	SELinux: keep the code clean formating and syntax	2008-07-14 15:01:36 +10:00
avc.h	selinux: avoid unnecessary avc cache stat hit count	2011-05-19 21:22:53 -07:00
avc_ss.h	selinux: dynamic class/perm discovery	2009-10-07 21:56:42 +11:00
classmap.h	SELinux: Auto-generate security_is_socket_class	2011-03-03 15:19:43 -05:00
conditional.h	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
initial_sid_to_string.h	selinux: const strings in tables	2010-03-08 09:33:53 +11:00
netif.h	SELinux: Convert the netif code to use ifindex values	2008-01-30 08:17:21 +11:00
netlabel.h	selinux: always call sk_security_struct sksec	2010-04-08 09:17:02 +10:00
netnode.h	SELinux: Add a network node caching mechanism similar to the sel_netif_*() functions	2008-01-30 08:17:23 +11:00
netport.h	SELinux: add netport.[ch]	2008-04-18 20:26:17 +10:00
objsec.h	switch selinux delayed superblock handling to iterate_supers()	2010-05-21 18:31:17 -04:00
security.h	SELinux: security_read_policy should take a size_t not ssize_t	2011-04-25 10:19:02 -04:00
xfrm.h	xfrm: Mark flowi arg to security_xfrm_state_pol_flow_match() const.	2011-02-22 18:13:15 -08:00