kernel_optimize_test/security/keys
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
..
encrypted-keys
compat.c
gc.c
internal.h
key.c
keyctl.c
keyring.c
Makefile
permission.c
proc.c
process_keys.c
request_key_auth.c
request_key.c
sysctl.c
trusted.c
trusted.h
user_defined.c