From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 17 Nov 2009 09:16:43 +0000 (+0100)
Subject: Merge branch 'perf/core' into perf/probes
X-Git-Tag: v2.6.33-rc1~399^2~165
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7b63425a41cd6a8d50f76fef0660c5110f97e91;p=pandora-kernel.git

Merge branch 'perf/core' into perf/probes

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

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

a7b63425a41cd6a8d50f76fef0660c5110f97e91
Reading git-diff-tree failed