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

[Bastian Blank]

Author: waldi
Date: Sat Nov 24 22:13:21 2012
New Revision: 19531

Log:
* debian/changelog: Update.
* debian/config/config: Enable NETPRIO_CGROUP.

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

Modified: dists/trunk/linux/debian/changelog
==============================================================================
--- dists/trunk/linux/debian/changelog	Sat Nov 24 22:09:46 2012	(r19530)
+++ dists/trunk/linux/debian/changelog	Sat Nov 24 22:13:21 2012	(r19531)
@@ -4,7 +4,7 @@
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.6.7
 
   [ Bastian Blank ]
-  * Enable POWER_SUPPLY and BLK_DEV_THROTTLING.
+  * Enable POWER_SUPPLY, BLK_DEV_THROTTLING and NETPRIO_CGROUP.
   * [amd64] Enable CRYPTO_CAMELLIA_X86_64, CRYPTO_SERPENT_AVX_X86_64 and
     CRYPTO_TWOFISH_AVX_X86_64.
   * [x86]: Enable more platform drivers.

Modified: dists/trunk/linux/debian/config/config
==============================================================================
--- dists/trunk/linux/debian/config/config	Sat Nov 24 22:09:46 2012	(r19530)
+++ dists/trunk/linux/debian/config/config	Sat Nov 24 22:13:21 2012	(r19531)
@@ -4047,6 +4047,7 @@
 # CONFIG_NETFILTER_DEBUG is not set
 CONFIG_NETFILTER_ADVANCED=y
 CONFIG_BRIDGE_NETFILTER=y
+CONFIG_NETPRIO_CGROUP=m
 CONFIG_BPF_JIT=y
 CONFIG_NET_PKTGEN=m
 # CONFIG_NET_TCPPROBE is not set