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