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
..
2010-05-06 10:56:07 +10:00
2010-04-19 11:53:17 -07:00
2010-04-23 07:08:28 +10:00
2010-04-24 11:31:26 -07:00
2010-04-28 01:07:29 -06:00
2010-04-30 09:25:12 -07:00
2010-04-24 11:31:25 -07:00
2010-03-06 11:26:28 -08:00