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

[Maximilian Attems]

Author: maks
Date: Fri Jan 23 16:25:30 2009
New Revision: 12597

Log:
topconfig enable NETFILTER_TPROXY

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	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jan 23 16:25:30 2009
@@ -16,7 +16,7 @@
     SOC_CAMERA_PLATFORM, VIDEO_SH_MOBILE_CEU, DVB_USB_DW2102, DVB_USB_ANYSEE,
     DVB_SIANO_SMS1XXX, DVB_DRX397XD, MMC_SDHCI_PCI, MMC_SDRICOH_CS,
     EDAC_I5100, RTC_DRV_M41T94, RTC_DRV_DS1305, UBIFS, EXT4 (closes: #512266),
-    CGROUP_FREEZER.
+    CGROUP_FREEZER, NETFILTER_TPROXY.
   * [x86] set MOUSE_BCM5974, X86_RESERVE_LOW_64K.
   * [x86_64] set AMD_IOMMU, MTRR_SANITIZER.
   * Add stable release 2.6.28.1

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	(original)
+++ dists/trunk/linux-2.6/debian/config/config	Fri Jan 23 16:25:30 2009
@@ -2442,6 +2442,7 @@
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
+CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m