From: James Morris Date: Fri, 14 Nov 2008 00:29:12 +0000 (+1100) Subject: Merge branch 'master' into next X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=2b828925652340277a889cbc11b2d0637f7cdaf7;p=linux-edison.git 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 --- 2b828925652340277a889cbc11b2d0637f7cdaf7