You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		14 years ago
..
Makefile	keys: add new key-type encrypted	14 years ago
compat.c	…
encrypted_defined.c	encrypted-keys: style and other cleanup	14 years ago
encrypted_defined.h	encrypted-keys: style and other cleanup	14 years ago
gc.c	…
internal.h	Add a dummy printk function for the maintenance of unused printks	15 years ago
key.c	…
keyctl.c	KEYS: Fix bug in keyctl_session_to_parent() if parent has no session keyring	15 years ago
keyring.c	…
permission.c	…
proc.c	KEYS: Make /proc/keys check to see if a key is possessed before security check	15 years ago
process_keys.c	Fix install_process_keyring error handling	14 years ago
request_key.c	KEYS: Don't call up_write() if __key_link_begin() returns an error	14 years ago
request_key_auth.c	…
sysctl.c	…
trusted_defined.c	trusted-keys: kzalloc and other cleanup	14 years ago
trusted_defined.h	keys: add new trusted key-type	14 years ago
user_defined.c	…