1
linux/security/selinux/include
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
avc_ss.h
avc.h selinux: avoid unnecessary avc cache stat hit count 2011-05-19 21:22:53 -07:00
classmap.h
conditional.h
initial_sid_to_string.h
netif.h
netlabel.h
netnode.h
netport.h
objsec.h
security.h SELinux: security_read_policy should take a size_t not ssize_t 2011-04-25 10:19:02 -04:00
xfrm.h