[kernel] r19560 - in dists/trunk/linux/debian: . config

[Maximilian Attems]

Author: maks
Date: Fri Nov 30 15:20:29 2012
New Revision: 19560

Log:
enalbe NET_EMATCH_IPSET

Modified:
   dists/trunk/linux/debian/changelog
   dists/trunk/linux/debian/config/config

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Fri Nov 30 15:20:27 2012	(r19559)
+++ dists/trunk/linux/debian/changelog	Fri Nov 30 15:20:29 2012	(r19560)
@@ -1,6 +1,6 @@
 linux (3.6.8-1~experimental.2) UNRELEASED; urgency=low
 
-  * Enable NETFILTER_XT_TARGET_HMARK.
+  * Enable NETFILTER_XT_TARGET_HMARK, NET_EMATCH_IPSET.
 
  -- maximilian attems <maks at debian.org>  Fri, 30 Nov 2012 15:54:56 +0100
 

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Fri Nov 30 15:20:27 2012	(r19559)
+++ dists/trunk/linux/debian/config/config	Fri Nov 30 15:20:29 2012	(r19560)
@@ -4593,6 +4593,7 @@
 CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_NET_EMATCH_IPSET=m
 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m