Merge branch 'linus' into tracing/core

Merge reason: update to upstream tracing facilities

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc kernel/trace/Kconfig
index 8a4136096d7d957f5d04feb3bbe615446b9aef2a,2246141bda4d1159745b957f7c1ace20aa6176e7..23b96ebbf8930b36cd288db6eebb328c365dbd42
--- 1/kernel/trace/Kconfig
--- 2/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@@ -99,13 -99,11 +99,12 @@@ config FUNCTION_GRAPH_TRACE
        help
          Enable the kernel to trace a function at both its return
          and its entry.
-         It's first purpose is to trace the duration of functions and
-         draw a call graph for each thread with some informations like
-         the return value.
-         This is done by setting the current return address on the current
-         task structure into a stack of calls.
+         Its first purpose is to trace the duration of functions and
+         draw a call graph for each thread with some information like
+         the return value. This is done by setting the current return 
+         address on the current task structure into a stack of calls.
  
 +
  config IRQSOFF_TRACER
        bool "Interrupts-off Latency Tracer"
        default n

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/trace/trace.h
Simple merge

diff --cc kernel/trace/trace_output.c
Simple merge

diff --cc kernel/trace/trace_output.h
Simple merge

diff --cc kernel/trace/trace_stat.c
Simple merge

diff --cc kernel/trace/trace_workqueue.c
Simple merge