From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 24 Mar 2018 08:21:14 +0000 (+0100)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflicts
X-Git-Tag: v4.17-rc1~179^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0;p=thirdparty%2Fkernel%2Flinux.git

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

Pick up a cherry-picked commit.

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

5701dd1e87d5b3e72226a6cc9b83ef740b4a3dd0