diff --git a/[refs] b/[refs]
index 06f876cc60b3..a3d43efa6fff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fa3a88cfdfc910d7f335aef588edf9819c05d54
+refs/heads/master: 5d7d18f5bc507b60d3d8967e2739d5e6ffdd630f
diff --git a/trunk/Makefile b/trunk/Makefile
index 3e95d454285c..ad830bd45a4b 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -597,6 +597,10 @@ LDFLAGS_BUILD_ID = $(patsubst -Wl$(comma)%,%,\
 LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
 LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
 
+ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
+LDFLAGS_vmlinux	+= -X
+endif
+
 # Default kernel image to build when no specific target is given.
 # KBUILD_IMAGE may be overruled on the command line or
 # set in the environment
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index f2f9b5362b48..7be4d3836745 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -808,6 +808,14 @@ 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