[kernel] r18773 - in dists/sid/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Sat Mar  3 19:54:34 2012
New Revision: 18773

Log:
cgroups: Set CGROUP_PERF

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sat Mar  3 19:30:37 2012	(r18772)
+++ dists/sid/linux-2.6/debian/changelog	Sat Mar  3 19:54:34 2012	(r18773)
@@ -28,6 +28,7 @@
     The precise restrictions are specified in Documentation/sysctl/fs.txt in
     the linux-doc-3.2 and linux-source-3.2 packages.
   * iwlwifi: fix key removal (Closes: #651199)
+  * cgroups: Set CGROUP_PERF
 
  -- Bastian Blank <waldi at debian.org>  Thu, 01 Mar 2012 11:47:17 +0100
 

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Sat Mar  3 19:30:37 2012	(r18772)
+++ dists/sid/linux-2.6/debian/config/config	Sat Mar  3 19:54:34 2012	(r18773)
@@ -3803,6 +3803,7 @@
 CONFIG_CGROUP_MEM_RES_CTLR_DISABLED=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 # CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
+CONFIG_CGROUP_PERF=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
 # CONFIG_RT_GROUP_SCHED is not set