tree 02a40eeb688f7ed9730e26a22f39ad7e04378de2
parent 292823814261e085cdcef06b6b691e6c2563fbd4
parent 722154e4cacf015161efe60009ae9be23d492296
author James Morris <jmorris@namei.org> 1273148464 +1000
committer James Morris <jmorris@namei.org> 1273148464 +1000

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>