Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / net / netfilter / ipset / Kconfig

diff --git a/net/netfilter/ipset/Kconfig b/net/netfilter/ipset/Kconfig
index a2d6263b6c648e97c663025660ad47320c2c08ff..44cd4f58adf08b914b871d7399942fb58168a623 100644 (file)
--- a/net/netfilter/ipset/Kconfig
+++ b/net/netfilter/ipset/Kconfig
@@ -21,7 +21,7 @@ config IP_SET_MAX
          You can define here default value of the maximum number 
          of IP sets for the kernel.
 
          You can define here default value of the maximum number 
          of IP sets for the kernel.
 

-         The value can be overriden by the 'max_sets' module
+         The value can be overridden by the 'max_sets' module

          parameter of the 'ip_set' module.
 
 config IP_SET_BITMAP_IP
          parameter of the 'ip_set' module.
 
 config IP_SET_BITMAP_IP