From: Robert Richter <robert.richter@amd.com>
Date: Fri, 1 Oct 2010 06:54:17 +0000 (+0200)
Subject: Merge branch 'oprofile/urgent' into oprofile/core
X-Git-Tag: firefly_0821_release~7613^2~3541^2~3^2~21
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66;p=firefly-linux-kernel-4.4.55.git

Merge branch 'oprofile/urgent' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

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

ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66