James Morris 12a5a2621b Merge branch 'master' into next ... Conflicts: include/linux/capability.h Manually resolve merge conflict w/ thanks to Stephen Rothwell. Signed-off-by: James Morris <jmorris@namei.org>		2011-05-19 18:51:57 +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	KEYS: Make request_key() and co. return an error for a negative key	2011-03-17 11:59:49 +11:00
selinux	Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus	2011-05-13 09:52:16 +10:00
smack	SECURITY: Move exec_permission RCU checks into security modules	2011-04-22 16:17:29 -07: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-22 16:17:29 -07:00
commoncap.c	capabilities: do not special case exec of init	2011-04-04 10:31:06 +10:00
device_cgroup.c
inode.c	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on ARM.	2011-03-22 09:35:12 +11:00
lsm_audit.c
Makefile
min_addr.c
security.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-22 16:17:29 -07:00