James Morris 8fcc995495 Merge branch 'next' into for-linus ... Conflicts: security/integrity/evm/evm_crypto.c Resolved upstream fix vs. next conflict manually. Signed-off-by: James Morris <jmorris@namei.org>		2012-01-09 12:16:48 +11:00
..
apparmor	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
integrity	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
keys	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
selinux	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
smack	Smack: smackfs cipso seq read repair	2011-11-11 11:07:21 -08:00
tomoyo	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
capability.c	->permission() sanitizing: don't pass flags to ->inode_permission()	2011-07-20 01:43:26 -04:00
commoncap.c	capabilities: initialize has_cap	2011-08-16 09:20:45 +10:00
device_cgroup.c	security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()	2011-07-20 11:05:30 -07:00
inode.c	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
Kconfig	encrypted-keys: remove trusted-keys dependency	2011-09-14 15:23:49 -04:00
lsm_audit.c	LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH	2011-04-25 18:14:07 -04:00
Makefile	integrity: move ima inode integrity data management	2011-07-18 12:29:38 -04:00
min_addr.c
security.c	security: Fix security_old_inode_init_security() when CONFIG_SECURITY is not set	2012-01-03 16:12:19 -08:00