From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 May 2008 23:22:08 +0000 (+0200)
Subject: ftrace: fix merge
X-Git-Tag: v2.6.27-rc1~1102^2^2~3^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1829d2705daa7cb72eb1e08bdc8b7e9fad34266;p=pandora-kernel.git

ftrace: fix merge

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

Reading git-diff-tree failed