From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 19 Feb 2009 12:01:37 +0000 (+0100)
Subject: tracing/function-graph-tracer: fix merge
X-Git-Tag: v2.6.30-rc1~2^2~93
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a8bf859331e349713274825e6fbf20bf2ac15a;p=pandora-kernel.git

tracing/function-graph-tracer: fix merge

Merge artifact: pid got changed to ent->pid meanwhile.

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

Reading git-diff-tree failed