* debian/changelog: Update.

* debian/config/config: Enable NETPRIO_CGROUP.

svn path=/dists/trunk/linux/; revision=19531
This commit is contained in:
Bastian Blank 2012-11-24 22:13:21 +00:00
parent 84512ae699
commit 10be003187
2 changed files with 2 additions and 1 deletions

2
debian/changelog vendored
View File

@ -4,7 +4,7 @@ linux (3.6.7-1~experimental.1) UNRELEASED; urgency=low
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.

View File

@ -4047,6 +4047,7 @@ CONFIG_NETFILTER=y
# 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