| Index: chromeos/config/config.common.chromeos | 
| diff --git a/chromeos/config/config.common.chromeos b/chromeos/config/config.common.chromeos | 
| index cfa3a389387a2ad8b141d7dd4f11f1f3d552fb35..066c1dd3d98c8051c75d6b05814bcefddfa2fa70 100644 | 
| --- a/chromeos/config/config.common.chromeos | 
| +++ b/chromeos/config/config.common.chromeos | 
| @@ -108,7 +108,13 @@ CONFIG_CFG80211_DEFAULT_PS=y | 
| CONFIG_CFG80211_DEFAULT_PS_VALUE=1 | 
| # CONFIG_CFG80211_DEVELOPER_WARNINGS is not set | 
| # CONFIG_CFG80211_REG_DEBUG is not set | 
| -# CONFIG_CGROUPS is not set | 
| +CONFIG_CGROUPS=y | 
| +# CONFIG_CGROUP_CPUACCT is not set | 
| +# CONFIG_CGROUP_DEBUG is not set | 
| +# CONFIG_CGROUP_DEVICE is not set | 
| +# CONFIG_CGROUP_FREEZER is not set | 
| +# CONFIG_CGROUP_NS is not set | 
| +CONFIG_CGROUP_SCHED=y | 
| # CONFIG_CHR_DEV_OSST is not set | 
| # CONFIG_CHR_DEV_SCH is not set | 
| # CONFIG_CHR_DEV_ST is not set | 
| @@ -120,6 +126,7 @@ CONFIG_CONNECTOR=y | 
| # CONFIG_CONSOLE_TRANSLATIONS is not set | 
| CONFIG_CONSTRUCTORS=y | 
| CONFIG_CONTEXT_SWITCH_TRACER=y | 
| +# CONFIG_CPUSETS is not set | 
| # CONFIG_CRAMFS is not set | 
| CONFIG_CRC16=y | 
| CONFIG_CRC32=y | 
| @@ -308,6 +315,7 @@ CONFIG_EXT4_FS_SECURITY=y | 
| CONFIG_EXT4_FS_XATTR=y | 
| CONFIG_EXTRA_FIRMWARE="" | 
| # CONFIG_EZX_PCAP is not set | 
| +CONFIG_FAIR_GROUP_SCHED=y | 
| CONFIG_FAT_DEFAULT_CODEPAGE=437 | 
| CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | 
| CONFIG_FAT_FS=m | 
| @@ -403,7 +411,7 @@ CONFIG_GPIOLIB=y | 
| # CONFIG_GPIO_LANGWELL is not set | 
| # CONFIG_GPIO_MC33880 is not set | 
| CONFIG_GPIO_SYSFS=y | 
| -# CONFIG_GROUP_SCHED is not set | 
| +CONFIG_GROUP_SCHED=y | 
| # CONFIG_HAMRADIO is not set | 
| CONFIG_HAS_DMA=y | 
| CONFIG_HAS_IOMEM=y | 
| @@ -738,6 +746,7 @@ CONFIG_NETWORK_SECMARK=y | 
| # CONFIG_NET_9P is not set | 
| # CONFIG_NET_CLS_ACT is not set | 
| # CONFIG_NET_CLS_BASIC is not set | 
| +# CONFIG_NET_CLS_CGROUP is not set | 
| # CONFIG_NET_CLS_FLOW is not set | 
| # CONFIG_NET_CLS_FW is not set | 
| # CONFIG_NET_CLS_ROUTE4 is not set | 
| @@ -902,6 +911,7 @@ CONFIG_RD_GZIP=y | 
| # CONFIG_REGULATOR is not set | 
| # CONFIG_REISERFS_FS is not set | 
| CONFIG_RELAY=y | 
| +# CONFIG_RESOURCE_COUNTERS is not set | 
| CONFIG_RFKILL=y | 
| # CONFIG_RFKILL_INPUT is not set | 
| CONFIG_RFKILL_LEDS=y | 
| @@ -923,6 +933,7 @@ CONFIG_RTC_LIB=y | 
| # CONFIG_RTL8187SE is not set | 
| # CONFIG_RTL8192E is not set | 
| # CONFIG_RTL8192SU is not set | 
| +# CONFIG_RT_GROUP_SCHED is not set | 
| CONFIG_RT_MUTEXES=y | 
| # CONFIG_RT_MUTEX_TESTER is not set | 
| # CONFIG_SAMPLES is not set | 
| @@ -1235,6 +1246,7 @@ CONFIG_USB_VIDEO_CLASS=m | 
| # CONFIG_USB_ZC0301 is not set | 
| # CONFIG_USB_ZR364XX is not set | 
| CONFIG_USER_NS=y | 
| +# CONFIG_USER_SCHED is not set | 
| CONFIG_UTS_NS=y | 
| # CONFIG_UWB is not set | 
| CONFIG_V4L_USB_DRIVERS=y | 
|  |