Merge branch 'linus' into x86/urgent, to pick up dependent commits
authorIngo Molnar <mingo@kernel.org>
Fri, 5 May 2017 06:20:52 +0000 (08:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 5 May 2017 06:21:03 +0000 (08:21 +0200)
We are going to fix a bug introduced by a more recent commit, so
refresh the tree.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge