From: Robert Richter <robert.richter@amd.com>
Date: Mon, 25 Oct 2010 14:58:34 +0000 (+0200)
Subject: Merge branch 'oprofile/core' into oprofile/x86
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4cafc4b8d7219b70e15f22e4a51b3ce847810caf;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'oprofile/core' into oprofile/x86

Conflicts:
	arch/x86/oprofile/op_model_amd.c

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

4cafc4b8d7219b70e15f22e4a51b3ce847810caf