diff --git a/[refs] b/[refs]
index bcb19ef128eb..8261177e5be0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa0e4e4aea8d9e0a559a884336d728f0263063e0
+refs/heads/master: ee2e6841b934d76cb944a3390bbea84da777d4fa
diff --git a/trunk/security/selinux/xfrm.c b/trunk/security/selinux/xfrm.c
index 5b7776504e4c..b2af7ca496c1 100644
--- a/trunk/security/selinux/xfrm.c
+++ b/trunk/security/selinux/xfrm.c
@@ -146,7 +146,7 @@ static int selinux_xfrm_sec_ctx_alloc(struct xfrm_sec_ctx **ctxp, struct xfrm_us
 	return rc;
 
 out:
-	*ctxp = 0;
+	*ctxp = NULL;
 	kfree(ctx);
 	return rc;
 }