From: Robert Richter <robert.richter@amd.com>
Date: Mon, 11 Oct 2010 17:33:42 +0000 (+0200)
Subject: Merge branch 'oprofile/core' (early part) into oprofile/perf
X-Git-Tag: v3.12-rc1~8270^2~3^2~13^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=652953b72eea8b9d1bd6b9f67b796c6722bada3a;p=kernel%2Fkernel-generic.git

Merge branch 'oprofile/core' (early part) into oprofile/perf

Conflicts:
	arch/arm/oprofile/common.c

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

652953b72eea8b9d1bd6b9f67b796c6722bada3a