James Morris 2b82892565 Merge branch 'master' into next
Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>
2008-11-14 11:29:12 +11:00
..
2008-10-20 08:50:26 -07:00
2008-10-23 08:55:02 -07:00
2008-10-20 16:17:42 -07:00
2008-11-14 11:29:12 +11:00
2007-10-20 01:27:18 +02:00
2008-11-14 11:29:12 +11:00
2008-04-28 08:58:18 -07:00
2008-11-12 10:37:48 -08:00
2008-07-28 16:30:21 -07:00
2008-07-28 16:30:21 -07:00
2008-10-30 11:38:47 -07:00
2008-11-14 11:29:12 +11:00
2008-11-12 17:17:17 -08:00
2008-02-05 09:44:19 -08:00
2008-06-12 18:05:41 -07:00
2007-10-20 01:27:18 +02:00
2008-10-20 08:52:40 -07:00
2008-10-09 12:18:27 -07:00
2008-10-20 08:52:32 -07:00
2008-10-20 08:52:32 -07:00