James Morris 2c9e703c61 Merge branch 'master' into next ... Conflicts: fs/exec.c Removed IMA changes (the IMA checks are now performed via may_open()). Signed-off-by: James Morris <jmorris@namei.org>		2009-05-22 18:40:59 +10:00
..
integrity/ima	integrity: path_check update	2009-05-22 09:43:41 +10:00
keys	keys: Handle there being no fallback destination keyring for request_key()	2009-04-09 10:41:19 -07:00
selinux	selinux: remove obsolete read buffer limit from sel_read_bool	2009-05-19 23:56:11 +10:00
smack	smack: do not beyond ARRAY_SIZE of data	2009-05-22 12:34:48 +10:00
tomoyo	Reduce path_lookup() abuses	2009-05-09 10:49:42 -04:00
capability.c	lsm: Remove the socket_post_accept() hook	2009-03-28 15:01:37 +11:00
commoncap.c	Merge branch 'master' into next	2009-05-08 17:56:47 +10:00
device_cgroup.c	devcgroup: avoid using cgroup_lock	2009-04-02 19:04:55 -07:00
inode.c	securityfs: securityfs_remove should handle IS_ERR pointers	2009-05-12 11:06:11 +10:00
Kconfig	Kconfig and Makefile	2009-02-12 15:19:00 +11:00
lsm_audit.c	smack: implement logging V3	2009-04-14 09:00:19 +10:00
Makefile	smack: implement logging V3	2009-04-14 09:00:23 +10:00
root_plug.c	Revert "CRED: Fix regression in cap_capable() as shown up by sys_faccessat() [ver #2]"	2009-01-07 09:21:54 +11:00
security.c	CacheFiles: Export things for CacheFiles	2009-04-03 16:42:40 +01:00