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
..
apparmor
integrity/ima
keys	Merge branch 'next' into for-linus	2011-05-24 22:55:24 +10:00
selinux	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
smack	Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-24 23:20:19 +10:00
tomoyo
capability.c
commoncap.c
device_cgroup.c
inode.c
Kconfig
lsm_audit.c
Makefile
min_addr.c
security.c