From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 19 Aug 2009 12:50:35 +0000 (+0200)
Subject: Merge branch 'perfcounters/urgent' into perfcounters/core
X-Git-Tag: v2.6.32-rc1~720^2~30
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96d6e48bc6b38342a59ccd23e25907d12caaeaf8;p=pandora-kernel.git

Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
	tools/perf/builtin-annotate.c
	tools/perf/builtin-report.c

Merge reason: resolve these conflicts.

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

96d6e48bc6b38342a59ccd23e25907d12caaeaf8
Reading git-diff-tree failed