Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Thu, 31 May 2018 10:27:56 +0000 (12:27 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 31 May 2018 10:27:56 +0000 (12:27 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge