From: Linus Torvalds Date: Fri, 31 Oct 2014 20:57:45 +0000 (-0700) Subject: Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v3.18-rc3~23 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c958f9200fb48d092b17d3784168e4a6c56bbddc;p=linux.git Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull futex fixes from Ingo Molnar: "This contains two futex fixes: one fixes a race condition, the other clarifies shared/private futex comments" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Fix a race condition between REQUEUE_PI and task death futex: Mention key referencing differences between shared and private futexes --- c958f9200fb48d092b17d3784168e4a6c56bbddc