diff --git a/[refs] b/[refs]
index b85507d992e4..71207029abd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a80ff03e05e4343d647780c116b02ec86078fd24
+refs/heads/master: 842426e719f86cd5709617208efae93ff1a1e2d8
diff --git a/trunk/include/linux/in6.h b/trunk/include/linux/in6.h
index 304aaedea305..086ec2ac8c5f 100644
--- a/trunk/include/linux/in6.h
+++ b/trunk/include/linux/in6.h
@@ -142,6 +142,7 @@ struct in6_flowlabel_req
 #define IPV6_TLV_PADN		1
 #define IPV6_TLV_ROUTERALERT	5
 #define IPV6_TLV_JUMBO		194
+#define IPV6_TLV_HAO		201	/* home address option */
 
 /*
  *	IPV6 socket options
diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h
index d995662e94c4..5bf4406e26d4 100644
--- a/trunk/include/linux/ipv6.h
+++ b/trunk/include/linux/ipv6.h
@@ -86,6 +86,16 @@ struct rt2_hdr {
 #define rt2_type		rt_hdr.type
 };
 
+/*
+ *	home address option in destination options header
+ */
+
+struct ipv6_destopt_hao {
+	__u8			type;
+	__u8			length;
+	struct in6_addr		addr;
+} __attribute__ ((__packed__));
+
 struct ipv6_auth_hdr {
 	__u8  nexthdr;
 	__u8  hdrlen;           /* This one is measured in 32 bit units! */