Merge commit 'linus/master' into HEAD

Conflicts:
	MAINTAINERS

Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>

1 files changed, 10 insertions, 8 deletions

diff --git a/init/Kconfig b/init/Kconfig
index c649657e2259..fed6dc31b0da 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -809,14 +809,6 @@ config KALLSYMS_EXTRA_PASS
            you wait for kallsyms to be fixed.
 
 
-config STRIP_ASM_SYMS
-        bool "Strip assembler-generated symbols during link"
-        default n
-        help
-          Strip internal assembler-generated symbols during a link (symbols
-          that look like '.Lxxx') so they don't pollute the output of
-          get_wchan() and suchlike.
-
 config HOTPLUG
         bool "Support for hot-pluggable devices" if EMBEDDED
         default y
@@ -936,6 +928,8 @@ config AIO
 
 config HAVE_PERF_COUNTERS
         bool
+        help
+          See tools/perf/design.txt for details.
 
 menu "Performance Counters"
 
@@ -996,6 +990,14 @@ config SLUB_DEBUG
           SLUB sysfs support. /sys/slab will not exist and there will be
           no support for cache validation etc.
 
+config STRIP_ASM_SYMS
+        bool "Strip assembler-generated symbols during link"
+        default n
+        help
+          Strip internal assembler-generated symbols during a link (symbols
+          that look like '.Lxxx') so they don't pollute the output of
+          get_wchan() and suchlike.
+
 config COMPAT_BRK
         bool "Disable heap randomization"
         default y