From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 7 Mar 2018 08:23:12 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflict
X-Git-Tag: v4.17-rc1~179^2~39
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f986eefc89c528bf2d398a6dc3637b743a7139e;p=thirdparty%2Flinux.git

Merge branch 'perf/urgent' into perf/core, to resolve conflict

Conflicts:
	tools/perf/perf.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

3f986eefc89c528bf2d398a6dc3637b743a7139e