James Morris 043b4d40f5 Merge branch 'master' into next ... Conflicts: security/keys/keyring.c Resolved conflict with whitespace fix in find_keyring_by_name() Signed-off-by: James Morris <jmorris@namei.org>		2010-05-06 22:21:04 +10:00
..
Makefile	KEYS: Add garbage collection for dead, revoked and expired keys. [try #6]	2009-09-02 21:29:11 +10:00
compat.c	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	2009-09-02 21:29:22 +10:00
gc.c	KEYS: Fix RCU handling in key_gc_keyring()	2010-05-05 11:39:23 +10:00
internal.h	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	2009-09-02 21:29:22 +10:00
key.c	security: whitespace coding style fixes	2010-04-23 10:10:23 +10:00
keyctl.c	security: whitespace coding style fixes	2010-04-23 10:10:23 +10:00
keyring.c	Merge branch 'master' into next	2010-05-06 22:21:04 +10:00
permission.c	security: whitespace coding style fixes	2010-04-23 10:10:23 +10:00
proc.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
process_keys.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
request_key.c	Merge branch 'master' into next	2010-05-06 22:21:04 +10:00
request_key_auth.c	CRED: Inaugurate COW credentials	2008-11-14 10:39:23 +11:00
sysctl.c	sysctl: Drop & in front of every proc_handler.	2009-11-18 08:37:40 -08:00
user_defined.c	KEYS: Fix an RCU warning in the reading of user keys	2010-05-05 11:38:52 +10:00