]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'linus' into locking/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2017 10:20:53 +0000 (12:20 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 10 Aug 2017 10:20:53 +0000 (12:20 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/futex.c

diff --cc kernel/futex.c
Simple merge