From 31175c4cd8af8db8f7ef54307ef01307e0f51e27 Mon Sep 17 00:00:00 2001
From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Tue, 1 Jan 2013 00:35:31 +0000
Subject: [PATCH] --- yaml --- r: 348397 b: refs/heads/master c:
 db2b620aa03d1301398dcba8b1097686bd82e65b h: refs/heads/master i:   348395:
 5b0ddef419fec1b7d97eb58d7e9bc47539834ea3 v: v3

---
 [refs]                                       | 2 +-
 trunk/Documentation/networking/ip-sysctl.txt | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8c3784b57489..470343a74d9c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b87e573413c3d6a006f572fb4d2105ff5d97fda
+refs/heads/master: db2b620aa03d1301398dcba8b1097686bd82e65b
diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt
index dd52d516cb89..ac1710ef21af 100644
--- a/trunk/Documentation/networking/ip-sysctl.txt
+++ b/trunk/Documentation/networking/ip-sysctl.txt
@@ -1331,6 +1331,12 @@ force_tllao - BOOLEAN
 	race condition where the sender deletes the cached link-layer address
 	prior to receiving a response to a previous solicitation."
 
+ndisc_notify - BOOLEAN
+	Define mode for notification of address and device changes.
+	0 - (default): do nothing
+	1 - Generate unsolicited neighbour advertisements when device is brought
+	    up or hardware address changes.
+
 icmp/*:
 ratelimit - INTEGER
 	Limit the maximal rates for sending ICMPv6 packets.