From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 15 Apr 2010 07:13:26 +0000 (+0200)
Subject: Merge branch 'perf/live' into perf/core
X-Git-Tag: v2.6.35-rc1~522^2~103
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84b13fd596522db47f9545d5124c30cc00dfdf5a;p=pandora-kernel.git

Merge branch 'perf/live' into perf/core

Conflicts:
	tools/perf/builtin-record.c

Merge reason: add the live tracing feature, resolve conflict.

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

84b13fd596522db47f9545d5124c30cc00dfdf5a
Reading git-diff-tree failed