Merge tag 'v4.12-rc5' into ras/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 14 Jun 2017 05:31:46 +0000 (07:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 14 Jun 2017 05:31:46 +0000 (07:31 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge