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-Url: https://git.stricted.de/?a=commitdiff_plain;h=652953b72eea8b9d1bd6b9f67b796c6722bada3a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.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