Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 25 Jan 2017 14:52:46 +0000 (15:52 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 25 Jan 2017 14:52:46 +0000 (15:52 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge