Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Fri, 25 May 2018 06:02:43 +0000 (08:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 25 May 2018 06:02:43 +0000 (08:02 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge