James Morris 043b4d40f5 Merge branch 'master' into next ... Conflicts: security/keys/keyring.c Resolved conflict with whitespace fix in find_keyring_by_name() Signed-off-by: James Morris <jmorris@namei.org>		2010-05-06 22:21:04 +10:00
..
integrity/ima	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
keys	Merge branch 'master' into next	2010-05-06 22:21:04 +10:00
selinux	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
smack	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
tomoyo	TOMOYO: Use mutex_lock_interruptible.	2010-05-06 13:19:18 +10:00
Kconfig	remove CONFIG_SECURITY_FILE_CAPABILITIES compile option	2009-11-24 15:06:47 +11:00
Makefile	NOMMU: Optimise away the {dac_,}mmap_min_addr tests	2009-12-17 09:25:19 +11:00
capability.c	security: remove dead hook acct	2010-04-12 12:19:19 +10:00
commoncap.c	security: whitespace coding style fixes	2010-04-23 10:10:23 +10:00
device_cgroup.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
inode.c	security: testing the wrong variable in create_by_name()	2010-04-22 21:17:41 +10:00
lsm_audit.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	security: remove dead hook acct	2010-04-12 12:19:19 +10:00