Merge branch 'linus' into x86/asm, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Sat, 11 Jun 2016 09:25:50 +0000 (11:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Sat, 11 Jun 2016 09:25:50 +0000 (11:25 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge