Merge branch 'locking/core' into x86/core, to prepare for dependent patch
authorIngo Molnar <mingo@kernel.org>
Wed, 3 Jun 2015 08:07:35 +0000 (10:07 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 3 Jun 2015 08:07:35 +0000 (10:07 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge