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-07-25 10:53:26 -07:00
2008-02-03 17:48:52 +02:00
2008-07-24 10:47:33 -07:00
2008-06-06 11:29:10 -07:00
2008-02-03 17:48:52 +02:00
2008-04-29 08:11:16 -07:00
2008-05-14 19:11:14 -07:00
2007-10-19 11:53:41 -07:00
2008-07-26 12:00:07 -07:00
2008-07-26 12:00:07 -07:00
2008-01-24 20:40:05 -08:00
2008-11-14 10:39:23 +11:00
2008-07-26 12:00:07 -07:00
2007-10-19 11:53:41 -07:00
2008-07-30 16:29:19 -07:00
2008-01-30 13:33:00 +01:00
2008-07-26 12:00:10 -07:00
2008-07-26 12:00:10 -07:00
2008-07-22 19:24:31 +10:00