[kernel] r8661 - in dists/trunk/linux-2.6/debian: . arch

[Maximilian Attems]

Author: maks
Date: Mon May 21 14:28:35 2007
New Revision: 8661

Log:
start config work for 2.6.22-rc2


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

Modified: dists/trunk/linux-2.6/debian/arch/config
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/config	(original)
+++ dists/trunk/linux-2.6/debian/arch/config	Mon May 21 14:28:35 2007
@@ -360,6 +360,8 @@
 CONFIG_TCP_CONG_HYBLA=m
 CONFIG_TCP_CONG_VEGAS=m
 CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
 
 #
 # IP: Virtual Server Configuration
@@ -1213,6 +1215,7 @@
 CONFIG_NF_CONNTRACK_ENABLED=m
 CONFIG_AC97_BUS=m
 CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 # CONFIG_MTD_CK804XROM is not set
 CONFIG_TOUCHSCREEN_UCB1400=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 21 14:28:35 2007
@@ -7,8 +7,10 @@
 
   [ maximilian attems ]
   * Cleanup configs of old unused variables.
+  * Enable CONFIG_TCP_CONG_YEAH, CONFIG_TCP_CONG_ILLINOIS,
+    CONFIG_NF_CONNTRACK_SANE in topconfig.
 
- -- maximilian attems <maks at debian.org>  Mon, 21 May 2007 15:27:02 +0200
+ -- maximilian attems <maks at debian.org>  Mon, 21 May 2007 16:29:29 +0200
 
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low