From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 4 Jun 2009 11:59:26 +0000 (+0200)
Subject: Merge branch 'tracing/ftrace' into tracing/core
X-Git-Tag: v2.6.31-rc1~401^2~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=64edbc562034f2ec3fce382cb208fab40586d005;p=users%2Fhch%2Fmisc.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 <mingo@elte.hu>
---

64edbc562034f2ec3fce382cb208fab40586d005