Merge branch 'locking/urgent' into locking/core, to pick up dependency
authorIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 12:35:29 +0000 (14:35 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 12:35:29 +0000 (14:35 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge