Merge branch 'linus' into perfcounters/core

Merge reason: need the upstream facility added by:

  7f1e2ca: hrtimer: fix rq->lock inversion (again)

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 3 insertions, 1 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 4f647142f2e6..35659ed442e5 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1051,7 +1051,7 @@ source "arch/Kconfig"
 
 config SLOW_WORK
         default n
-        bool "Enable slow work thread pool"
+        bool
         help
           The slow work thread pool provides a number of dynamically allocated
           threads that can be used by the kernel to perform operations that
@@ -1061,6 +1061,8 @@ config SLOW_WORK
           by a series of mkdirs and a create call, all of which have to touch
           disk.
 
+          See Documentation/slow-work.txt.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT