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	encrypted-keys: module build fixes	2011-11-16 14:23:14 -05:00
compat.c
gc.c
internal.h
key.c	KEYS: Give key types their own lockdep class for key->sem	2011-11-17 09:35:32 +11:00
keyctl.c
keyring.c
Makefile
permission.c
proc.c
process_keys.c
request_key_auth.c
request_key.c
sysctl.c
trusted.c	security: follow rename pack_hex_byte() to hex_byte_pack()	2011-10-31 17:30:56 -07:00
trusted.h
user_defined.c	KEYS: Fix a NULL pointer deref in the user-defined key type	2011-11-15 22:32:38 -02:00