diff --git a/[refs] b/[refs] index 73d5b77a9860..5c693e96e81f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b15d0558e82df9b3659804ceb44187b98eda354 +refs/heads/master: 2d0f25201ee210a0666ec9c41538ba05a07f8bc6 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index 20d6bd919b8d..4c4edf2ec4a9 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -688,7 +688,7 @@ config CGROUP_PERF depends on PERF_EVENTS && CGROUPS help This option extends the per-cpu mode to restrict monitoring to - threads which belong to the cgroup specificied and run on the + threads which belong to the cgroup specified and run on the designated cpu. Say N if unsure.