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

..

evm_crypto.c

Merge branch 'next' into for-linus

2012-01-09 12:16:48 +11:00

evm_main.c

evm: digital signature verification support

2011-11-09 16:51:14 +02:00

evm_posix_acl.c

evm: posix acls modify i_mode

2011-09-14 15:24:51 -04:00

evm_secfs.c

…

evm.h

evm: digital signature verification support

2011-11-09 16:51:14 +02:00

Kconfig

…

Makefile

evm: posix acls modify i_mode

2011-09-14 15:24:51 -04:00