Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

Conflicts:

	net/sunrpc/auth_gss/gss_krb5_crypto.c
	net/sunrpc/auth_gss/gss_spkm3_token.c
	net/sunrpc/clnt.c

Merge with mainline and fix conflicts.

1 files changed, 12 insertions, 0 deletions

diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 2b2a10da64a4..c86a1bf589d4 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -87,6 +87,16 @@ SECTIONS {
                 *(__ksymtab_gpl)
                 __stop___ksymtab_gpl = .;
 
+                /* Kernel symbol table: Normal unused symbols */
+                __start___ksymtab_unused = .;
+                *(__ksymtab_unused)
+                __stop___ksymtab_unused = .;
+
+                /* Kernel symbol table: GPL-only unused symbols */
+                __start___ksymtab_unused_gpl = .;
+                *(__ksymtab_unused_gpl)
+                __stop___ksymtab_unused_gpl = .;
+
                 /* Kernel symbol table: GPL-future symbols */
                 __start___ksymtab_gpl_future = .;
                 *(__ksymtab_gpl_future)
@@ -149,10 +159,12 @@ SECTIONS {
                 __security_initcall_start = .;
                 *(.security_initcall.init)
                 __security_initcall_end = .;
+#ifdef CONFIG_BLK_DEV_INITRD
                 . = ALIGN(4);
                 __initramfs_start = .;
                 *(.init.ramfs)
                 __initramfs_end = .;
+#endif
                 . = ALIGN(4096);
                 __init_end = .;
         } > INIT