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-22 07:37:17 +02:00
2008-11-14 11:29:12 +11:00
2008-11-14 10:39:23 +11:00
2008-11-14 10:39:23 +11:00
2008-11-14 11:29:12 +11:00
2008-10-16 11:21:30 -07:00
2008-11-14 11:29:12 +11:00
2008-09-14 16:25:35 +02:00
2008-07-28 14:37:38 +02:00
2007-07-16 09:05:50 -07:00
2008-11-14 10:39:23 +11:00
2008-08-13 12:55:10 +02:00
2008-10-28 11:19:07 +01:00
2008-09-02 19:21:40 -07:00
2008-11-14 10:39:23 +11:00
2008-10-21 15:59:53 +02:00
2008-11-10 10:51:51 +01:00
2008-11-11 11:57:22 +01:00
2008-11-05 10:30:14 +01:00
2008-11-14 11:29:12 +11:00
2007-07-16 09:05:50 -07:00
2008-11-14 10:39:23 +11:00
2008-11-06 08:41:56 +01:00
2008-10-16 11:21:31 -07:00
2008-02-06 10:41:02 -08:00
2008-10-16 11:21:51 -07:00
2008-11-14 10:39:23 +11:00
2008-07-25 10:53:45 -07:00
2008-11-14 11:29:12 +11:00
2008-11-14 10:39:23 +11:00
2008-10-16 11:21:47 -07:00
2008-10-16 11:21:31 -07:00
2008-11-14 11:29:12 +11:00