Merge tag 'v4.12-rc4' into x86/mm, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Mon, 5 Jun 2017 07:54:49 +0000 (09:54 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 5 Jun 2017 07:54:49 +0000 (09:54 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge