Merge branch 'linus' into x86/platform, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2017 14:49:46 +0000 (16:49 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2017 14:49:46 +0000 (16:49 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge