Merge branch 'tracing/ftrace' into tracing/urgent

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/sparc64/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/Makefile
Simple merge

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

diff --cc kernel/Makefile
Simple merge

diff --cc kernel/sysctl.c
Simple merge