diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:52:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 22:52:48 -0800 |
| commit | b8bf17d311c875de02550d5ce2af66588734159a (patch) | |
| tree | 82d829df77f3eb506d10928fd633a8a6e5685082 /init/Kconfig | |
| parent | 9fc5c3e3237e02a94f41cd1d2b4291593d29791d (diff) | |
| parent | bced76aeaca03b45e3b4bdb868cada328e497847 (diff) | |
| download | linux-3.10-b8bf17d311c875de02550d5ce2af66588734159a.tar.gz linux-3.10-b8bf17d311c875de02550d5ce2af66588734159a.tar.bz2 linux-3.10-b8bf17d311c875de02550d5ce2af66588734159a.zip | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched: Fix lockup by limiting load-balance retries on lock-break
sched: Fix CONFIG_CGROUP_SCHED dependency
sched: Remove empty #ifdefs
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index a075765d5fb..018d206c21f 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -713,7 +713,6 @@ config CGROUP_PERF menuconfig CGROUP_SCHED bool "Group CPU scheduler" - depends on EXPERIMENTAL default n help This feature lets CPU scheduler recognize task groups and control CPU |