From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 5 Oct 2010 07:47:14 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00e8976200665eec2fa9264d61885b4d1384d4f0;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.

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

00e8976200665eec2fa9264d61885b4d1384d4f0
Reading git-diff-tree failed