diff --git a/[refs] b/[refs]
index 69de096cae4d..355e3d18fc0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 390fbd1bfaa7b561af8e4f385067c55bdf4100ba
+refs/heads/master: 6a0dc8d733de4aca958a73019877f96b4754d671
diff --git a/trunk/net/xfrm/xfrm_algo.c b/trunk/net/xfrm/xfrm_algo.c
index f1cf3402e75c..248f94814dfb 100644
--- a/trunk/net/xfrm/xfrm_algo.c
+++ b/trunk/net/xfrm/xfrm_algo.c
@@ -265,6 +265,23 @@ static struct xfrm_algo_desc ealg_list[] = {
                 .sadb_alg_maxbits = 256,
         }
 },
+{
+	.name = "cbc(camellia)",
+
+	.uinfo = {
+		.encr = {
+			.blockbits = 128,
+			.defkeybits = 128,
+		}
+	},
+
+	.desc = {
+		.sadb_alg_id = SADB_X_EALG_CAMELLIACBC,
+		.sadb_alg_ivlen = 8,
+		.sadb_alg_minbits = 128,
+		.sadb_alg_maxbits = 256
+	}
+},
 {
         .name = "cbc(twofish)",
         .compat = "twofish",