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
..
include	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
.gitignore	.gitignore: ignore apparmor/rlim_names.h	2010-10-21 10:12:35 +11:00
apparmorfs.c	apparmor: sparse fix: make aa_create_aafs static	2011-09-09 16:56:25 -07:00
audit.c	apparmor: add missing rcu_dereference()	2011-12-09 12:08:41 +11:00
capability.c
context.c
domain.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6	2011-07-27 19:26:38 -07:00
file.c
ipc.c	apparmor: sparse fix: include ipc.h	2011-09-09 16:56:27 -07:00
Kconfig	apparmor: depends on NET	2010-08-05 07:36:51 -04:00
lib.c	apparmor: sparse fix: add apparmor.h to lib.c	2011-09-09 16:56:28 -07:00
lsm.c	apparmor: fix module parameter handling	2011-12-16 12:45:24 +11:00
Makefile	AppArmor: cleanup generated files correctly	2011-03-08 17:03:53 -08:00
match.c	Create Documentation/security/,	2011-05-19 15:59:38 -07:00
path.c	fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API	2011-12-06 23:57:18 -05:00
policy.c	APPARMOR: Fix memory leak of alloc_namespace()	2010-11-11 07:36:18 +11:00
policy_unpack.c	apparmor: sparse fix: rename shadowed variables in policy_unpack.c	2011-09-09 16:56:28 -07:00
procattr.c	apparmor: sparse fix: include procattr.h in procattr.c	2011-09-09 16:56:29 -07:00
resource.c	AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes	2010-09-08 09:19:29 +10:00
sid.c	AppArmor: core policy routines	2010-08-02 15:38:37 +10:00