Merge branch 'locking/arch-atomic' into locking/core, because it's ready for upstream
authorIngo Molnar <mingo@kernel.org>
Wed, 12 Aug 2015 09:44:30 +0000 (11:44 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 12 Aug 2015 09:44:30 +0000 (11:44 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge