Merge branch 'linus' into locking/urgent, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 10 Aug 2016 12:11:54 +0000 (14:11 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 10 Aug 2016 12:11:54 +0000 (14:11 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge