James Morris 043b4d40f5 Merge branch 'master' into next
Conflicts:
	security/keys/keyring.c

Resolved conflict with whitespace fix in find_keyring_by_name()

Signed-off-by: James Morris <jmorris@namei.org>
2010-05-06 22:21:04 +10:00
..
2009-09-21 14:29:21 +02:00
2010-04-12 12:19:19 +10:00
2009-06-24 00:02:38 -04:00
2010-03-24 16:31:19 -07:00
2010-05-06 10:56:07 +10:00
2009-09-18 09:48:52 -07:00
2009-12-14 23:55:34 +01:00
2009-07-24 10:53:29 +02:00
2009-01-14 18:09:02 +01:00
2010-02-10 17:47:17 -08:00
2010-03-06 11:26:32 -08:00
2010-04-02 20:06:40 +02:00
2009-12-09 10:03:07 +01:00
2010-03-06 11:26:33 -08:00
2010-03-12 15:52:32 -08:00
2010-05-06 10:56:07 +10:00
2010-03-12 15:53:10 -08:00
2010-03-06 11:26:23 -08:00
2009-09-23 18:13:10 -07:00
2010-01-21 13:40:18 +01:00
2009-06-18 13:03:55 -07:00