Merge branch 'locking/urgent' into locking/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Tue, 9 Feb 2016 11:03:15 +0000 (12:03 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 9 Feb 2016 11:03:15 +0000 (12:03 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge