Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2014 20:57:45 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 31 Oct 2014 20:57:45 +0000 (13:57 -0700)
commitc958f9200fb48d092b17d3784168e4a6c56bbddc
treee5bdf4fa493521daf96a45ae6a82903189dd03b9
parentaea4869f68b5869afbb308bfb7d777d725df8900
parent30a6b8031fe14031ab27c1fa3483cb9780e7f63c
Merge branch 'locking-urgent-for-linus' of git://git./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