Merge commit 'v2.6.28-rc2' into tracing/urgent

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/include/asm/ftrace.h
index 233bb9b869c0605665b48a51b7b46f5f7ffc40a6,47f7e65e6c1d51bbd17715127e8ffc00a2c7afb8..9e8bc29b8b17dd3739d7479af6920c3c627130cb
--- 1/include/asm-x86/ftrace.h
--- 2/arch/x86/include/asm/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
@@@ -1,7 -1,7 +1,7 @@@
- #ifndef ASM_X86__FTRACE_H
- #define ASM_X86__FTRACE_H
+ #ifndef _ASM_X86_FTRACE_H
+ #define _ASM_X86_FTRACE_H
  
 -#ifdef CONFIG_FTRACE
 +#ifdef CONFIG_FUNCTION_TRACER
  #define MCOUNT_ADDR           ((long)(mcount))
  #define MCOUNT_INSN_SIZE      5 /* sizeof mcount call */
  
@@@ -19,6 -19,6 +19,6 @@@ static inline unsigned long ftrace_call
  }
  #endif
  
 -#endif /* CONFIG_FTRACE */
 +#endif /* CONFIG_FUNCTION_TRACER */
  
- #endif /* ASM_X86__FTRACE_H */
+ #endif /* _ASM_X86_FTRACE_H */

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc kernel/sysctl.c
Simple merge