Merge branch 'linus' into irq/core

Merge reason: update to almost-final-.36 Signed-off-by: Ingo Molnar <mingo@elte.hu>
2010-10-20 04:38:56 +02:00
parent 9717967c4b 2b666ca4a6
commit 14d4962dc8
331 changed files with 2634 additions and 1499 deletions
--- a/arch/sh/kernel/module.c
+++ b/arch/sh/kernel/module.c
@ -149,13 +149,11 @@ int module_finalize(const Elf_Ehdr *hdr,
 	int ret = 0;

 	ret |= module_dwarf_finalize(hdr, sechdrs, me);
-	ret |= module_bug_finalize(hdr, sechdrs, me);

 	return ret;
 }

 void module_arch_cleanup(struct module *mod)
 {
-	module_bug_cleanup(mod);
 	module_dwarf_cleanup(mod);
 }