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

[Maximilian Attems]

Author: maks
Date: Thu May 24 07:30:53 2012
New Revision: 19031

Log:
topconfig enable new net scheduler

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	Thu May 24 07:30:44 2012	(r19030)
+++ dists/trunk/linux-2.6/debian/changelog	Thu May 24 07:30:53 2012	(r19031)
@@ -4,7 +4,7 @@
 
   * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
     IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
-    NETFILTER_XT_MATCH_NFACCT.
+    NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Thu May 24 07:30:44 2012	(r19030)
+++ dists/trunk/linux-2.6/debian/config/config	Thu May 24 07:30:53 2012	(r19031)
@@ -4570,6 +4570,7 @@
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
 CONFIG_NET_CLS_BASIC=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_ROUTE4=m