Merge commit 'v2.6.36-rc7' into perf/core

Conflicts:
	arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

Signed-off-by: Ingo Molnar <[email protected]>

diff --cc Makefile
Simple merge

diff --cc arch/x86/kernel/module.c
index 5399f58de7ed356098a8d408a9c4d0acc7809b30,1c355c550960ab75279c644b52269cd5a368239a..8f295609173524cdf06a20c6c0ad4fbe1de12263
--- 1/arch/x86/kernel/module.c
--- 2/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@@ -239,10 -239,7 +239,10 @@@ int module_finalize(const Elf_Ehdr *hdr
                apply_paravirt(pseg, pseg + para->sh_size);
        }
  
-       return module_bug_finalize(hdr, sechdrs, me);
 +      /* make jump label nops */
 +      jump_label_apply_nops(me);
 +
+       return 0;
  }
  
  void module_arch_cleanup(struct module *mod)

diff --cc include/linux/module.h
Simple merge

diff --cc kernel/module.c
Simple merge