From d3cd0035c3e9298bbdbc51c24ed90ee218940da5 Mon Sep 17 00:00:00 2001
From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Date: Tue, 31 Aug 2010 05:50:43 +0000
Subject: [PATCH] --- yaml --- r: 210266 b: refs/heads/master c:
 750e9fad8c7f44e0005ffb7195f72dd76978c2cf h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv4/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e096706da222..3997867195c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 928497f0209027ccd649480a38a499fab9c3f6f6
+refs/heads/master: 750e9fad8c7f44e0005ffb7195f72dd76978c2cf
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index 7c3a7d191249..571f8950ed06 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -46,7 +46,7 @@ config IP_ADVANCED_ROUTER
 	  rp_filter on use:
 
 	  echo 1 > /proc/sys/net/ipv4/conf/<device>/rp_filter
-	   and
+	   or
 	  echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter
 
 	  Note that some distributions enable it in startup scripts.