From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Fri, 27 Aug 2010 00:28:40 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~96^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98ee74a75ca0f047e75400afa712f7bf08268b8e;p=pandora-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/callchain.h

Merge reason:
	Fix a non-trivial conflict with latest fixes
---

98ee74a75ca0f047e75400afa712f7bf08268b8e
Reading git-diff-tree failed