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: v2.6.29-rc1~586^2~58^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=985809608f758a8d3ddda4ce5a53ed0e57fb9e1b;p=karo-tx-linux.git Merge branch 'tracing/ftrace' into tracing/function-return-tracer --- 985809608f758a8d3ddda4ce5a53ed0e57fb9e1b