From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 3 Apr 2010 16:17:55 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.35-rc1~522^2~126
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: resolve the conflict.

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

22a4e4c435bbc0edccc2e7e5143ce4fbe9679e2d
Reading git-diff-tree failed