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-26 20:53:14 -04:00
2008-10-10 20:02:48 -04:00
2008-11-14 10:38:51 +11:00
2008-09-08 22:25:24 -04:00
2008-10-25 22:37:55 -04:00
2008-10-07 00:46:36 -04:00
2008-10-10 20:02:48 -04:00
2008-04-29 18:13:32 -04:00
2008-08-19 22:16:07 -04:00
2008-10-16 20:00:24 -04:00
2008-10-28 00:08:12 -04:00
2008-10-07 00:46:36 -04:00
2008-10-10 20:02:48 -04:00
2008-10-05 20:50:06 -04:00
2008-07-11 19:27:31 -04:00
2008-09-08 22:25:24 -04:00
2008-11-14 11:29:12 +11:00
2008-11-07 09:06:45 -05:00
2008-10-10 20:29:21 -04:00
2008-10-20 11:43:59 -07:00
2008-10-10 20:02:48 -04:00
2008-11-04 09:10:50 -05:00
2008-10-16 20:00:24 -04:00
2008-09-13 12:52:26 -04:00
2008-10-23 12:03:23 -07:00
2008-10-10 09:40:52 -04:00
2008-11-04 09:11:26 -05:00
2008-10-10 20:02:48 -04:00
2008-04-29 18:13:32 -04:00
2008-07-11 19:27:31 -04:00
2008-07-11 19:27:31 -04:00
2008-10-10 20:02:48 -04:00
2008-10-10 20:02:48 -04:00