Jiri Kosina 07f9479a40 Merge branch 'master' into for-next ... Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.		2011-04-26 10:22:59 +02: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: Add an iovec version of KEYCTL_INSTANTIATE	2011-03-08 11:17:22 +11:00
selinux	Merge branch 'master' into for-next	2011-04-26 10:22:59 +02:00
smack	SECURITY: Move exec_permission RCU checks into security modules	2011-04-22 16:17:29 -07:00
tomoyo	Fix common misspellings	2011-03-31 11:26:23 -03:00
capability.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-22 16:17:29 -07:00
commoncap.c	userns: allow ptrace from non-init user namespaces	2011-03-23 19:47:05 -07:00
device_cgroup.c
inode.c	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
Kconfig	keys: add new key-type encrypted	2010-11-29 08:55:29 +11:00
lsm_audit.c
Makefile	AppArmor: Enable configuring and building of the AppArmor security module	2010-08-02 15:38:34 +10:00
min_addr.c
security.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-22 16:17:29 -07:00