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	Fix common misspellings	2011-03-31 11:26:23 -03:00
integrity/ima	ima: remove unnecessary call to ima_must_measure	2011-02-23 16:38:52 -05:00
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	TOMOYO: Fix wrong domainname validation.	2011-05-12 11:07:21 +10:00
capability.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-25 10:20:32 -04:00
commoncap.c	capabilities: do not special case exec of init	2011-04-04 10:31:06 +10:00
device_cgroup.c
inode.c
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on ARM.	2011-03-22 09:35:12 +11:00
lsm_audit.c	LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH	2011-04-25 18:14:07 -04:00
Makefile
min_addr.c
security.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-25 10:20:32 -04:00