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

[Maximilian Attems]

Author: maks
Date: Mon May  9 11:42:11 2011
New Revision: 17325

Log:
topconfig enable new netfilter features

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon May  9 11:42:07 2011	(r17324)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May  9 11:42:11 2011	(r17325)
@@ -3,6 +3,7 @@
   * [x86] Enable modular ASUS_WMI and ASUS_NB_WMI. (closes: #626141)
   * [x86] Enable modular DELL_WMI_AIO, HP_ACCEL, INTEL_IPS, ACPI_IPMI.
   * [x86/486] Enable modular XO1_RFKILL, XO15_EBOOK.
+  * topconfig: Enable modular NF_CONNTRACK_TIMESTAMP, NF_CONNTRACK_SNMP.
 
  -- maximilian attems <maks at debian.org>  Mon, 09 May 2011 11:53:05 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May  9 11:42:07 2011	(r17324)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May  9 11:42:11 2011	(r17325)
@@ -3980,6 +3980,7 @@
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_SCTP=m
 CONFIG_NF_CT_PROTO_UDPLITE=m
@@ -3988,6 +3989,7 @@
 CONFIG_NF_CONNTRACK_H323=m
 CONFIG_NF_CONNTRACK_IRC=m
 CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
 CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m