Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
authorIngo Molnar <mingo@kernel.org>
Tue, 24 Feb 2015 07:41:07 +0000 (08:41 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 24 Feb 2015 07:41:07 +0000 (08:41 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/futex.c

diff --cc kernel/futex.c
Simple merge