Merge commit 'v2.6.32' into next

1 files changed, 13 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index f51586406d62..eb4b33725db1 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -606,7 +606,7 @@ config SYSFS_DEPRECATED
         bool
 
 config SYSFS_DEPRECATED_V2
-        bool "remove sysfs features which may confuse old userspace tools"
+        bool "enable deprecated sysfs features which may confuse old userspace tools"
         depends on SYSFS
         default n
         select SYSFS_DEPRECATED
@@ -937,7 +937,7 @@ config PERF_EVENTS
           Enable kernel support for various performance events provided
           by software and hardware.
 
-          Software events are supported either build-in or via the
+          Software events are supported either built-in or via the
           use of generic tracepoints.
 
           Most modern CPUs support performance events via performance
@@ -949,7 +949,7 @@ config PERF_EVENTS
           used to profile the code that runs on that CPU.
 
           The Linux Performance Event subsystem provides an abstraction of
-          these software and hardware cevent apabilities, available via a
+          these software and hardware event capabilities, available via a
           system call and used by the "perf" utility in tools/perf/. It
           provides per task and per CPU counters, and it provides event
           capabilities on top of those.
@@ -1098,6 +1098,16 @@ config SLOW_WORK
 
           See Documentation/slow-work.txt.
 
+config SLOW_WORK_DEBUG
+        bool "Slow work debugging through debugfs"
+        default n
+        depends on SLOW_WORK && DEBUG_FS
+        help
+          Display the contents of the slow work run queue through debugfs,
+          including items currently executing.
+
+          See Documentation/slow-work.txt.
+
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT