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: Ubuntu-5.2.0-15.16~23328^2~18^2~13
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66;p=mirror_ubuntu-eoan-kernel.git

Merge branch 'oprofile/urgent' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

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

ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66