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-Url: https://git.stricted.de/?a=commitdiff_plain;h=0361e02342f60b64a7075755d5851ed4e6f98c7d;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'oprofile/perf' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

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

0361e02342f60b64a7075755d5851ed4e6f98c7d