Merge branch 'linus' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sun, 11 Dec 2016 12:05:59 +0000 (13:05 +0100)
committerIngo Molnar <mingo@kernel.org>
Sun, 11 Dec 2016 12:05:59 +0000 (13:05 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge