original_kernel/security/keys
James Morris d2e7ad1922 Merge branch 'master' into next
Conflicts:
	security/smack/smack_lsm.c

Verified and added fix by Stephen Rothwell <sfr@canb.auug.org.au>
Ok'd by Casey Schaufler <casey@schaufler-ca.com>

Signed-off-by: James Morris <jmorris@namei.org>
2011-01-10 09:46:24 +11:00
..
Makefile
compat.c
encrypted_defined.c
encrypted_defined.h
gc.c
internal.h
key.c
keyctl.c
keyring.c
permission.c
proc.c
process_keys.c
request_key.c
request_key_auth.c
sysctl.c
trusted_defined.c
trusted_defined.h
user_defined.c