Turning trellis back to trunk to check in the latest differnce.

[linux-2.6.git] / planetlab-2.6.27-i686.config

diff --git a/planetlab-2.6.27-i686.config b/planetlab-2.6.27-i686.config
index 12d8870..43399e4 100644 (file)
--- a/planetlab-2.6.27-i686.config
+++ b/planetlab-2.6.27-i686.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.27.14-vs2.3.0.36.4.0.planetlab
-# Tue Feb  3 15:48:12 2009
+# Linux kernel version: 2.6.27.14-vs2.3.0.36.4.2.planetlab
+# Fri Apr 10 18:26:48 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -76,12 +76,25 @@ CONFIG_TASK_IO_ACCOUNTING=y
 # CONFIG_AUDIT is not set
 # CONFIG_IKCONFIG is not set
 CONFIG_LOG_BUF_SHIFT=17
-# CONFIG_CGROUPS is not set
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NS is not set
+CONFIG_CGROUP_DEVICE=y
 CONFIG_OOM_PANIC=y
+CONFIG_CPUSETS=y
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-# CONFIG_GROUP_SCHED is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_USER_SCHED is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_RESOURCE_COUNTERS=y
+CONFIG_MM_OWNER=y
+CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_PROC_PID_CPUSET=y
 CONFIG_RELAY=y
 CONFIG_NAMESPACES=y
 CONFIG_UTS_NS=y
@@ -1087,12 +1100,13 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
 CONFIG_IFB=m
+CONFIG_EGRE=m
 CONFIG_DUMMY=m
 CONFIG_BONDING=m
-# CONFIG_MACVLAN is not set
+CONFIG_MACVLAN=y
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
-# CONFIG_VETH is not set
+CONFIG_VETH=y
 CONFIG_NET_SB1000=m
 # CONFIG_ARCNET is not set
 CONFIG_PHYLIB=m
@@ -1512,7 +1526,7 @@ CONFIG_NSC_GPIO=m
 CONFIG_CS5535_GPIO=m
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_HPET is not set
-CONFIG_HANGCHECK_TIMER=m
+CONFIG_HANGCHECK_TIMER=y
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
 CONFIG_TCG_NSC=m