From: Robert Richter <robert.richter@amd.com>
Date: Mon, 11 Oct 2010 17:38:39 +0000 (+0200)
Subject: Merge branch 'oprofile/perf' into oprofile/core
X-Git-Tag: v2.6.37-rc1~214^2~18^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0361e02342f60b64a7075755d5851ed4e6f98c7d;p=~emulex%2Finfiniband.git

Merge branch 'oprofile/perf' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
---

0361e02342f60b64a7075755d5851ed4e6f98c7d