tree 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a
parent 3a3b7ce9336952ea7b9564d976d068a238976c9d
parent 58e20d8d344b0ee083febb18c2b021d2427e56ca
author James Morris <jmorris@namei.org> 1226622552 +1100
committer James Morris <jmorris@namei.org> 1226622552 +1100

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>