Merge tag 'v4.12-rc6' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 20 Jun 2017 08:48:44 +0000 (10:48 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 20 Jun 2017 08:48:44 +0000 (10:48 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge