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-10-01 21:17:49 +02:00
2010-04-24 11:31:25 -07:00
2010-02-24 13:51:32 +01:00
2008-10-16 11:21:30 -07:00
2010-04-05 10:37:36 -05:00
2008-02-03 15:54:28 +02:00
2009-12-09 14:21:36 -08:00
2009-12-12 13:08:16 +01:00
2010-03-01 12:35:43 -03:00
2008-01-11 18:22:30 -06:00
2005-04-16 15:20:36 -07:00
2009-06-18 13:04:04 -07:00
2009-10-04 22:53:41 +02:00
2008-12-03 16:09:53 -07:00
2008-07-25 10:53:30 -07:00
2009-10-15 07:25:20 -06:00
2010-04-22 15:24:56 -07:00
2009-07-01 22:36:22 +02:00
2009-08-28 15:21:12 -04:00
2009-04-27 12:00:27 -07:00
2009-04-27 12:00:27 -07:00
2008-11-12 17:17:17 -08:00
2006-06-27 17:32:47 -07:00
2009-04-14 09:00:23 +10:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00