diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sh/configs/shx3_defconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sh/configs/shx3_defconfig')
| -rw-r--r-- | arch/sh/configs/shx3_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/configs/shx3_defconfig b/arch/sh/configs/shx3_defconfig index bb4f60c0f866..6bb413036892 100644 --- a/arch/sh/configs/shx3_defconfig +++ b/arch/sh/configs/shx3_defconfig | |||
| @@ -9,13 +9,11 @@ CONFIG_IKCONFIG=y | |||
| 9 | CONFIG_IKCONFIG_PROC=y | 9 | CONFIG_IKCONFIG_PROC=y |
| 10 | CONFIG_LOG_BUF_SHIFT=14 | 10 | CONFIG_LOG_BUF_SHIFT=14 |
| 11 | CONFIG_CGROUPS=y | 11 | CONFIG_CGROUPS=y |
| 12 | CONFIG_CGROUP_NS=y | ||
| 13 | CONFIG_CGROUP_FREEZER=y | 12 | CONFIG_CGROUP_FREEZER=y |
| 14 | CONFIG_CGROUP_DEVICE=y | 13 | CONFIG_CGROUP_DEVICE=y |
| 15 | CONFIG_CGROUP_CPUACCT=y | 14 | CONFIG_CGROUP_CPUACCT=y |
| 16 | CONFIG_RESOURCE_COUNTERS=y | 15 | CONFIG_RESOURCE_COUNTERS=y |
| 17 | CONFIG_CGROUP_MEM_RES_CTLR=y | 16 | CONFIG_CGROUP_MEM_RES_CTLR=y |
| 18 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 19 | CONFIG_RELAY=y | 17 | CONFIG_RELAY=y |
| 20 | CONFIG_NAMESPACES=y | 18 | CONFIG_NAMESPACES=y |
| 21 | CONFIG_UTS_NS=y | 19 | CONFIG_UTS_NS=y |