linux-stable-rt/security/selinux/ss
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
..
avtab.c
avtab.h
conditional.c
conditional.h
constraint.h
context.h
ebitmap.c
ebitmap.h
hashtab.c
hashtab.h
mls.c
mls.h
mls_types.h
policydb.c SELinux: delete debugging printks from filename_trans rule processing 2011-05-12 16:02:42 -04:00
policydb.h SELinux: put name based create rules in a hashtable 2011-04-28 15:15:53 -04:00
services.c Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus 2011-05-24 23:20:19 +10:00
services.h
sidtab.c
sidtab.h
status.c
symtab.c
symtab.h