]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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


Trivial merge