From: Ingo Molnar Date: Thu, 4 Jun 2009 11:59:26 +0000 (+0200) Subject: Merge branch 'tracing/ftrace' into tracing/core X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=64edbc562034f2ec3fce382cb208fab40586d005;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'tracing/ftrace' into tracing/core Merge reason: this mini-topic had outstanding problems that delayed its merge, so it does not fast-forward. Signed-off-by: Ingo Molnar --- 64edbc562034f2ec3fce382cb208fab40586d005