From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 23 Oct 2009 06:23:20 +0000 (+0200)
Subject: Merge branch 'perf/core' into perf/probes
X-Git-Tag: v2.6.33-rc1~399^2~187
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43315956509ca6913764861ac7dec128b91eb1ec;p=pandora-kernel.git

Merge branch 'perf/core' into perf/probes

Conflicts:
	tools/perf/Makefile

Merge reason:

 - fix the conflict
 - pick up the pr_*() infrastructure to queue up dependent patch

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

43315956509ca6913764861ac7dec128b91eb1ec
Reading git-diff-tree failed