From: Ingo Molnar Date: Sun, 16 Nov 2008 06:57:13 +0000 (+0100) Subject: Merge branch 'tracing/ftrace' into tracing/function-return-tracer X-Git-Tag: firefly_0821_release~13991^2~462^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=985809608f758a8d3ddda4ce5a53ed0e57fb9e1b;p=firefly-linux-kernel-4.4.55.git Merge branch 'tracing/ftrace' into tracing/function-return-tracer --- 985809608f758a8d3ddda4ce5a53ed0e57fb9e1b