Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/kernel/vmlinux.lds.S

1 files changed, 2 insertions, 10 deletions

diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S
index 1b7d9d541e0..a1e4ec24f1f 100644
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@@ -99,16 +99,8 @@ SECTIONS
         _ebss = .;                      /* uClinux MTD sucks */
         _end = . ;
 
-        /*
-         * When something in the kernel is NOT compiled as a module, the
-         * module cleanup code and data are put into these segments. Both
-         * can then be thrown away, as cleanup code is never called unless
-         * it's a module.
-         */
-        /DISCARD/ : {
-                EXIT_CALL
-        }
-
         STABS_DEBUG
         DWARF_DEBUG
+
+        DISCARDS
 }