Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sat, 6 Jan 2018 11:07:10 +0000 (12:07 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 6 Jan 2018 11:07:10 +0000 (12:07 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge