From 7a41d291ac5e1b72cae3c168c7ebc50769ae2f02 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Tue, 8 Jul 2008 02:37:07 -0700
Subject: [PATCH] --- yaml --- r: 103325 b: refs/heads/master c:
 58de7862e61cb71251a25314d1b3d7260af1448a h: refs/heads/master i:   103323:
 bd419358a30a1b46622de1d95d55121081d88bf6 v: v3

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

diff --git a/[refs] b/[refs]
index 27e72741fa8d..d11f9c2ae4d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdf060a5d3c2afc7998af94b26a6c5182419e071
+refs/heads/master: 58de7862e61cb71251a25314d1b3d7260af1448a
diff --git a/trunk/net/bridge/netfilter/Kconfig b/trunk/net/bridge/netfilter/Kconfig
index 540df4106bec..909479794999 100644
--- a/trunk/net/bridge/netfilter/Kconfig
+++ b/trunk/net/bridge/netfilter/Kconfig
@@ -230,7 +230,7 @@ config BRIDGE_EBT_NFLOG
 	  either the old LOG target, the old ULOG target or nfnetlink_log
 	  as backend.
 
-	  This option adds the ulog watcher, that you can use in any rule
+	  This option adds the nflog watcher, that you can use in any rule
 	  in any ebtables table.
 
 	  To compile it as a module, choose M here.  If unsure, say N.