diff --git a/[refs] b/[refs]
index 3fbdeaad2d67..5d405e186a1a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9928890c1f94da58bf753ede937b7324f6832866
+refs/heads/master: dd27466df9924706ae34639ce3f4f837875d45c1
diff --git a/trunk/include/linux/in6.h b/trunk/include/linux/in6.h
index 50cdc3ad61a7..304aaedea305 100644
--- a/trunk/include/linux/in6.h
+++ b/trunk/include/linux/in6.h
@@ -221,6 +221,20 @@ struct in6_flowlabel_req
 #define IPV6_DONTFRAG		62
 #define IPV6_USE_MIN_MTU	63
 #endif
+
+/*
+ * Netfilter
+ *
+ * Following socket options are used in ip6_tables;
+ * see include/linux/netfilter_ipv6/ip6_tables.h.
+ *
+ * IP6T_SO_SET_REPLACE / IP6T_SO_GET_INFO		64
+ * IP6T_SO_SET_ADD_COUNTERS / IP6T_SO_GET_ENTRIES	65
+ */
+
+/*
+ * Advanced API (RFC3542) (2)
+ */
 #define IPV6_RECVTCLASS		66
 #define IPV6_TCLASS		67